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

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

30 files changed, 50 insertions, 69 deletions

diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 84f05d59ba3..52f878a0c10 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 5e1ffb4bcf6..a4cb20671d4 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-tclconfig=${PREFIX}/lib/tcl8.2 \
+CONFIGURE_ARGS=	--with-tclconfig=${PREFIX}/lib/tcl8.2 \
 		--with-tclhdir=${PREFIX}/include/tcl8.2 \
 		--with-tclsh=${PREFIX}/bin/tclsh8.2 \
 		--with-tkconfig=${PREFIX}/lib/tk8.2 \
diff --git a/devel/crossgo32/Makefile b/devel/crossgo32/Makefile
index 2c3991d34a7..293e4acfacf 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 08e26ae3dab..299ab21110c 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 c25a3f34cb9..564e65e412d 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 0f03bbe64bd..4adcee4a1e6 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 45db58b4e13..d2c001f73e1 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 45db58b4e13..d2c001f73e1 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 edaceb3a34e..a2fe953eaec 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
 
diff --git a/editors/yudit/pkg-plist b/editors/yudit/pkg-plist
index d8ab18549fa..e41863c2a58 100644
--- a/editors/yudit/pkg-plist
+++ b/editors/yudit/pkg-plist
@@ -75,7 +75,7 @@ share/yudit/locale/ru.utf8/LC_MESSAGES/messages.mo
 share/yudit/locale/your.utf8/LC_MESSAGES/messages.mo
 share/yudit/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
 @dirrm share/yudit/config
-@dirrm share/yudit/data 
+@dirrm share/yudit/data
 @dirrm share/yudit/help
 @dirrm share/yudit/locale/de.utf8/LC_MESSAGES
 @dirrm share/yudit/locale/de.utf8
diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 4c9809afc25..e59c4d08e90 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -19,8 +19,6 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${VARDIR} --with-eb --with-zlib \
 		--with-eb-includes=${PREFIX}/include \
 		--with-eb-libraries=${PREFIX}/lib
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}"
 
 .if !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	Maybe_interactive_at_install_stage
diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index 4c9809afc25..e59c4d08e90 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -19,8 +19,6 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${VARDIR} --with-eb --with-zlib \
 		--with-eb-includes=${PREFIX}/include \
 		--with-eb-libraries=${PREFIX}/lib
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}"
 
 .if !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	Maybe_interactive_at_install_stage
diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 450e574bf21..917298bcfa6 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -21,14 +21,14 @@ MASTER_SITES=	ftp://berlin.ccc.de/pub/gd/src/                        \
 		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/   \
 		ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/FreeBSD/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} d2c-2.2.0-FreeBSD.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER= 	housel@acm.org
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		$(WRKDIR)/gd/src
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --prefix=$(PREFIX) --srcdir=$(WRKSRC)
+CONFIGURE_ARGS= --srcdir=$(WRKSRC)
 CONFIGURE_ENV=	D2C="$(WRKDIR)/d2c"
 
 USE_GMAKE=	yes
diff --git a/lang/dylan/pkg-descr b/lang/dylan/pkg-descr
index 52863c91624..91cf116432c 100644
--- a/lang/dylan/pkg-descr
+++ b/lang/dylan/pkg-descr
@@ -1,12 +1,11 @@
-This is a port of the CMU Gwydion project's implementation of the
-Dylan programming language.  Dylan is an object-oriented language with
-many powerful features, including automatic memory management (garbage
-collection), generic functions (also known as multiple dispatch or
-multi-methods), multiple inheritance, a powerful and safe macro
-facility for extending the language's syntax, and a powerful class and
-function library.  Though it is a DYnamic LANguage, it includes
-facilities for making compiled programs more efficient than many other
-dynamic languages.
+CMU Gwydion project's implementation of the Dylan programming language.
+Dylan is an object-oriented language with many powerful features, including
+automatic memory management (garbage collection), generic functions (also
+known as multiple dispatch or multi-methods), multiple inheritance, a
+powerful and safe macro facility for extending the language's syntax, and a
+powerful class and function library.  Though it is a DYnamic LANguage, it
+includes facilities for making compiled programs more efficient than many
+other dynamic languages.
 
 The Dylan language was originally developed by Apple, but the project
 was dropped just as the language definition was being finished and
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 58a613d52c0..d371b7a7182 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -14,9 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER= 	jmacd@FreeBSD.org
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
 ALL_TARGET = 	enough
-#NO_WRKSUBDIR=	yes
 STRIP=
 MAN1=		scheme48.1
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index ef72f36ea10..74f971c5029 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -37,9 +37,8 @@ CONFIGURE_ARGS=	--enable-syslog=1 \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildrop-uid="${MAILDROP_SUID}" \
 		--enable-maildrop-gid="${MAILDROP_SGID}"
-CONFIGURE_ENV=	CXX="${CXX}" \
-		CXXFLAGS="${CXXFLAGS} -I${PREFIX}/include" \
-		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
+		LIBS="-L${PREFIX}/lib"
 GNU_CONFIGURE=	yes
 
 .if defined(NOPORTDOCS)
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index ff289a4928d..bbf11edc022 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -20,16 +20,18 @@ MAN1=		dotfile.1
 
 NO_BUILD=	yes
 
-.if !defined(DISPLAY)
-BROKEN=		requires X display
-.endif
-
 post-configure:
 	@(cd ${WRKSRC}/Modules/procmail && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
 	INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
 	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 	${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
+.if !defined(DISPLAY)
+PLIST=		${WRKDIR}/PLIST
+pre-install:
+	@${CAT} ${PKGDIR}/PLIST | ${SED} -e '/fvwm.\/bytecompile/d' > ${PLIST}
+.endif
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/${DISTNAME}
 	@${MKDIR} ${PREFIX}/share/doc/${DISTNAME}/dotfile
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 84f05d59ba3..52f878a0c10 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index e2efaa8be5a..3edfb322eb5 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -31,7 +31,7 @@ STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --libdir=${SAMBA_CONFDIR} \
+CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
 
diff --git a/net/samba/Makefile b/net/samba/Makefile
index e2efaa8be5a..3edfb322eb5 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -31,7 +31,7 @@ STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --libdir=${SAMBA_CONFDIR} \
+CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
 
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index e2efaa8be5a..3edfb322eb5 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -31,7 +31,7 @@ STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --libdir=${SAMBA_CONFDIR} \
+CONFIGURE_ARGS=	 --libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-lockdir=${VARDIR}/spool/lock --with-privatedir=${SAMBA_PRIVATE}
 
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index d94ea31083a..4b7a1f56997 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR=	system/news/transport
 
 MAINTAINER=	brian@Awfulhak.org
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--quiet --prefix=${PREFIX}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--quiet
 MAKE_ARGS=	LOCKFILE=/var/spool/lock/news/fetch.lck \
 		LIBDIR=${PREFIX}/lib/leafnode
 MAN1=		newsq.1
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index de55523f20f..a05202d8470 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/teTeX-1.0
 EXTRACT_ONLY=	${TETEX_SRC}
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --prefix=${PREFIX} --disable-multiplatform \
+CONFIGURE_ARGS= --disable-multiplatform \
 		--without-texinfo --without-dialog \
 		--with-system-ncurses --with-system-zlib \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index de55523f20f..a05202d8470 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/teTeX-1.0
 EXTRACT_ONLY=	${TETEX_SRC}
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --prefix=${PREFIX} --disable-multiplatform \
+CONFIGURE_ARGS= --disable-multiplatform \
 		--without-texinfo --without-dialog \
 		--with-system-ncurses --with-system-zlib \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 4daff1a0ca5..357d6147c86 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -20,8 +20,7 @@ MAINTAINER=	markm@FreeBSD.org
 Y2K=		http://www.pgpi.com/faq/pgpi.shtml#Year2000
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
+GNU_CONFIGURE=	yes
 RESTRICTED=     "Crypto"
 MAN1=		pgp5.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
 MAN5=		pgp.cfg.5
diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index 4daff1a0ca5..357d6147c86 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -20,8 +20,7 @@ MAINTAINER=	markm@FreeBSD.org
 Y2K=		http://www.pgpi.com/faq/pgpi.shtml#Year2000
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
+GNU_CONFIGURE=	yes
 RESTRICTED=     "Crypto"
 MAN1=		pgp5.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
 MAN5=		pgp.cfg.5
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 7cc7302384f..6bc3cf7fb1d 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -24,7 +24,7 @@ RESTRICTED=	"Crypto; export-controlled"
 
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc --enable-debug
+CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --enable-debug
 #Uncomment if all your users are in their own group and their homedir
 #is writeable by that group.  Beware the security implications!
 #CONFIGURE_ARGS+= --enable-group-writeability
diff --git a/security/ssh2/pkg-descr b/security/ssh2/pkg-descr
index 88c6003dc9a..c0b7a0dce27 100644
--- a/security/ssh2/pkg-descr
+++ b/security/ssh2/pkg-descr
@@ -6,28 +6,18 @@ very easy-to-use program that uses strong cryptography for protecting
 all transmitted confidential data, including passwords, binary files,
 and administrative commands.
 
-  SSH Communications Security is the developer of the Secure Shell and
-the SSH protocol, technologies that are the de-facto standard for
-encrypted terminal connections on the Internet. The benefits of SSH
-include 
+The benefits of SSH include:
 
 o Automatic authentication of users, no passwords sent in cleartext to
   prevent the stealing of passwords.
-
 o Multiple strong authentication methods that prevent such security
   threats as spoofing identity.
-
 o Authentication of both ends of connection, the server and the client
   are authenticated to prevent identity spoofing, trojan horses, etc. 
-
 o Automatic authentication using agents to enable strong
   authentication to multiple systems with a single-sign-on.
-
 o Encryption and compression of data for security and speed.
-
 o Secure file transfer.
-
 o Tunneling and encryption of arbitrary connections.
 
-
 WWW: http://www.ssh.fi/
diff --git a/www/wml/Makefile b/www/wml/Makefile
index fc32491c6c5..fb6a9617440 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -18,9 +18,8 @@ MAINTAINER=	rse@engelschall.com
 .include <bsd.port.pre.mk>
 
 USE_PERL5=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-perl=${PERL5}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-perl=${PERL5}
 
 CAT1=	wml_aux_linklint.1 wml_aux_txt2html.1 \
 	wml_aux_wwwtable.1 wml_p2_mhc.1 wml_p4_gm4.1
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 96c14e13a69..8e4c0de8d41 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -29,7 +29,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
 EXTRACT_ONLY=	${DISTNAME}.tgz ${PKGNAME}-portKit-19981123.tgz
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --x-includes=${X11BASE}/include \
+CONFIGURE_ARGS=	--x-includes=${X11BASE}/include \
 		--mandir=${MANPREFIX}/man \
 		--includedir=${LOCALBASE}/include --libdir=${LOCALBASE}/lib
 CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"