svn commit: r329820 - head/devel/djgpp-binutils

[Danilo Egea Gondolfo]

Author: danilo
Date: Tue Oct  8 18:39:41 2013
New Revision: 329820
URL: http://svnweb.freebsd.org/changeset/ports/329820

Log:
  - Fix build with clang [1]
  - Convert USE_GMAKE to USES
  - Drop BINUTILVERSION variable
  - Add stage support
  
  PR:		ports/182538
  Submitted by:	Peter Johnson <johnson.peter at gmail.com> (maintainer) [1]
  Approved by:	wg/culot (mentors, implicit)

Modified:
  head/devel/djgpp-binutils/Makefile
  head/devel/djgpp-binutils/pkg-plist

Modified: head/devel/djgpp-binutils/Makefile
==============================================================================
--- head/devel/djgpp-binutils/Makefile	Tue Oct  8 18:34:45 2013	(r329819)
+++ head/devel/djgpp-binutils/Makefile	Tue Oct  8 18:39:41 2013	(r329820)
@@ -2,43 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	${BINUTILVERSION}
+PORTVERSION=	2.17
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
 PKGNAMEPREFIX=	djgpp-
-DISTNAME=	${PORTNAME}-${BINUTILVERSION}
 
 MAINTAINER=	johnson.peter at gmail.com
 COMMENT=	FSF binutils for DJGPP cross-development
 
 LICENSE=	GPLv2
 
-BINUTILVERSION=	2.17
-
 TARGET=		i586-pc-msdosdjgpp
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=	gmake
 GNU_CONFIGURE=	yes
-SRCDIR=		${WRKDIR}/binutils-${BINUTILVERSION}
+SRCDIR=		${WRKDIR}/binutils-${PORTVERSION}
 WRKSRC=		${WRKDIR}/build
 CONFIGURE_ARGS=	--target=${TARGET} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
-		--disable-nls --disable-shared
-INFO_PATH=	${TARGET}/info
-
-MAN1=	${TARGET}-addr2line.1 ${TARGET}-ar.1    \
-	${TARGET}-as.1 ${TARGET}-dlltool.1      \
-	${TARGET}-c++filt.1 ${TARGET}-ld.1      \
-	${TARGET}-nlmconv.1 ${TARGET}-nm.1      \
-	${TARGET}-objcopy.1 ${TARGET}-objdump.1 \
-	${TARGET}-ranlib.1 ${TARGET}-readelf.1  \
-	${TARGET}-size.1 ${TARGET}-strings.1    \
-	${TARGET}-strip.1 ${TARGET}-windres.1
+		--disable-nls --disable-shared --disable-werror
 
 INFO=		as bfd binutils ld configure standards
 INFO_PATH=	${TARGET}/info
@@ -46,25 +33,13 @@ INFO_PATH=	${TARGET}/info
 BINARIES=	addr2line ar as c++filt ld nm objcopy objdump ranlib \
 		readelf size strings strip
 
-NO_STAGE=	yes
 pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-install:
 .for F in ${BINARIES}
-	@${LN} -f ${PREFIX}/bin/${TARGET}-$F ${PREFIX}/${TARGET}/bin/$F
+	@${LN} -f ${STAGEDIR}${PREFIX}/bin/${TARGET}-$F ${STAGEDIR}${PREFIX}/${TARGET}/bin/$F
 .endfor
-
-#
-# UGLY HACK
-#
-add-plist-post:
-	@${ECHO_CMD} "@unexec rmdir -p %D/${TARGET}/info 2> /dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir -p %D/${TARGET} 2> /dev/null || true" >> ${TMPPLIST}
-.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
-	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
-.else
-	@${DO_NADA}
-.endif
+	@${RM} ${STAGEDIR}${PREFIX}/${TARGET}/info/dir
 
 .include <bsd.port.mk>

Modified: head/devel/djgpp-binutils/pkg-plist
==============================================================================
--- head/devel/djgpp-binutils/pkg-plist	Tue Oct  8 18:34:45 2013	(r329819)
+++ head/devel/djgpp-binutils/pkg-plist	Tue Oct  8 18:39:41 2013	(r329820)
@@ -1,3 +1,16 @@
+bin/i586-pc-msdosdjgpp-addr2line
+bin/i586-pc-msdosdjgpp-ar
+bin/i586-pc-msdosdjgpp-as
+bin/i586-pc-msdosdjgpp-c++filt
+bin/i586-pc-msdosdjgpp-ld
+bin/i586-pc-msdosdjgpp-nm
+bin/i586-pc-msdosdjgpp-objcopy
+bin/i586-pc-msdosdjgpp-objdump
+bin/i586-pc-msdosdjgpp-ranlib
+bin/i586-pc-msdosdjgpp-readelf
+bin/i586-pc-msdosdjgpp-size
+bin/i586-pc-msdosdjgpp-strings
+bin/i586-pc-msdosdjgpp-strip
 i586-pc-msdosdjgpp/bin/addr2line
 i586-pc-msdosdjgpp/bin/ar
 i586-pc-msdosdjgpp/bin/as
@@ -16,21 +29,24 @@ i586-pc-msdosdjgpp/lib/ldscripts/i386go3
 i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xn
 i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xr
 i586-pc-msdosdjgpp/lib/ldscripts/i386go32.xu
-i586-pc-msdosdjgpp/info/dir
-bin/i586-pc-msdosdjgpp-addr2line
-bin/i586-pc-msdosdjgpp-ar
-bin/i586-pc-msdosdjgpp-as
-bin/i586-pc-msdosdjgpp-c++filt
-bin/i586-pc-msdosdjgpp-ld
-bin/i586-pc-msdosdjgpp-nm
-bin/i586-pc-msdosdjgpp-objcopy
-bin/i586-pc-msdosdjgpp-objdump
-bin/i586-pc-msdosdjgpp-ranlib
-bin/i586-pc-msdosdjgpp-readelf
-bin/i586-pc-msdosdjgpp-size
-bin/i586-pc-msdosdjgpp-strings
-bin/i586-pc-msdosdjgpp-strip
- at dirrm i586-pc-msdosdjgpp/lib/ldscripts
+man/man1/i586-pc-msdosdjgpp-addr2line.1.gz
+man/man1/i586-pc-msdosdjgpp-ar.1.gz
+man/man1/i586-pc-msdosdjgpp-as.1.gz
+man/man1/i586-pc-msdosdjgpp-c++filt.1.gz
+man/man1/i586-pc-msdosdjgpp-dlltool.1.gz
+man/man1/i586-pc-msdosdjgpp-ld.1.gz
+man/man1/i586-pc-msdosdjgpp-nlmconv.1.gz
+man/man1/i586-pc-msdosdjgpp-nm.1.gz
+man/man1/i586-pc-msdosdjgpp-objcopy.1.gz
+man/man1/i586-pc-msdosdjgpp-objdump.1.gz
+man/man1/i586-pc-msdosdjgpp-ranlib.1.gz
+man/man1/i586-pc-msdosdjgpp-readelf.1.gz
+man/man1/i586-pc-msdosdjgpp-size.1.gz
+man/man1/i586-pc-msdosdjgpp-strings.1.gz
+man/man1/i586-pc-msdosdjgpp-strip.1.gz
+man/man1/i586-pc-msdosdjgpp-windres.1.gz
+ at dirrmtry i586-pc-msdosdjgpp/lib/ldscripts
 @dirrmtry i586-pc-msdosdjgpp/lib
+ at dirrmtry i586-pc-msdosdjgpp/info
 @dirrmtry i586-pc-msdosdjgpp/bin
 @dirrmtry i586-pc-msdosdjgpp