remove --prefix=${PREFIX} when GNU_CONFIGURE=yes and other minor cleanups

PR:		14759
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

7 files changed, 14 insertions, 13 deletions

diff --git a/devel/crossgo32/Makefile b/devel/crossgo32/Makefile
index 2c3991d..293e4ac 100644
--- a/devel/crossgo32/Makefile
+++ b/devel/crossgo32/Makefile
@@ -13,12 +13,12 @@ PKGNAME=	crossgo32-1.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cygnus.com/pub/embedded/crossgcc/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dosrel-1.0${EXTRACT_SUFX}
 
 MAINTAINER=	sutton@aardvark.apana.org.au
 
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dosrel-1.0${EXTRACT_SUFX}
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --target=${TARGET}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--target=${TARGET}
 USE_GMAKE=	yes
 TARGET= 	i386-go32
 
diff --git a/devel/crossgo32/pkg-descr b/devel/crossgo32/pkg-descr
index 08e26ae..299ab21 100644
--- a/devel/crossgo32/pkg-descr
+++ b/devel/crossgo32/pkg-descr
@@ -10,7 +10,6 @@ The GNU's C Compiler		gcc-2.7.2.2  + crosspatch
 Cygnus's embedded libraries	newlib-1.7.1
 Cygnus's dos release utilities  dosrel-1.0
 
-
 Compiling your code
 ===================
 
@@ -37,10 +36,8 @@ site. The DOS files mentioned above should be in
 /usr/local/share/crossgo32 (or similar on your system). Please check
 the DJGPP FAQ for more information on this topic.
 
-
 WWW: http://www.delorie.com/djgpp/ (DPMI server, source, FAQs, etc)
 
-
 Related ports 
 ============= 
 
@@ -54,7 +51,6 @@ If you are interested in network support and DJGPP v2 exe files,
 amongst other DJGPP bits and pieces, check out the crossgo32-dgjpp2
 selection of ports. 
 
-
 Share and enjoy,
 
 - Joel
diff --git a/devel/crossgo32/pkg-plist b/devel/crossgo32/pkg-plist
index c25a3f3..564e65e 100644
--- a/devel/crossgo32/pkg-plist
+++ b/devel/crossgo32/pkg-plist
@@ -97,6 +97,8 @@ include/bfd.h
 include/ansidecl.h
 include/bfdlink.h
 include/obstack.h
+@unexec install-info --delete %D/info/cpp.info %D/info/dir
+@unexec install-info --delete %D/info/gcc.info %D/info/dir
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -127,6 +129,8 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
+@exec install-info %D/info/cpp.info %D/info/dir
+@exec install-info %D/info/gcc.info %D/info/dir
 lib/libiberty.a
 lib/libi386-go32-bfd.a
 lib/gcc-lib/i386-go32/2.7.2.2/include/syslimits.h
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index 0f03bbe..4adcee4 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://www.engelschall.com/sw/mm/ \
 MAINTAINER=	rse@engelschall.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 MAN1=		mm-config.1
 MAN3=		mm.3
diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index 45db58b..d2c001f 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -12,10 +12,11 @@ MASTER_SITES=		${MASTER_SITE_GNU} \
 			ftp://ftp.clark.net/pub/dickey/ncurses/4.2/
 MASTER_SITE_SUBDIR=	ncurses
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} terminfo.src.gz
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		andy@icc.surw.chel.su
 
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+
 Y2K=            http://www.gnu.org/software/year2000.html
 
 MAN1=	captoinfo.1m clear.1 infocmp.1m tic.1m toe.1m tput.1 tset.1
@@ -50,7 +51,7 @@ MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
-		--prefix=${PREFIX} --with-profile --with-shared
+		--with-profile --with-shared
 CONFIGURE_ENV=		gnat_exists="no" ac_cv_path_LDCONFIG="${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib"
 
 .include <bsd.port.pre.mk>
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 45db58b..d2c001f 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -12,10 +12,11 @@ MASTER_SITES=		${MASTER_SITE_GNU} \
 			ftp://ftp.clark.net/pub/dickey/ncurses/4.2/
 MASTER_SITE_SUBDIR=	ncurses
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} terminfo.src.gz
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		andy@icc.surw.chel.su
 
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+
 Y2K=            http://www.gnu.org/software/year2000.html
 
 MAN1=	captoinfo.1m clear.1 infocmp.1m tic.1m toe.1m tput.1 tset.1
@@ -50,7 +51,7 @@ MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
-		--prefix=${PREFIX} --with-profile --with-shared
+		--with-profile --with-shared
 CONFIGURE_ENV=		gnat_exists="no" ac_cv_path_LDCONFIG="${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib"
 
 .include <bsd.port.pre.mk>
diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index edaceb3..a2fe953 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	rse@engelschall.com
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-batch
+CONFIGURE_ARGS=	--enable-batch
 
 MAN1=		shtool.1 shtoolize.1