Switch to GNU configure

PR:		34660
Submitted by:	"James E. Housley" <jeh@thehousleys.net>

14 files changed, 70 insertions, 246 deletions

diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index bbf6378a8a77..d0b4937e1d84 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	wu-ftpd
 PORTVERSION=	2.6.1
-PORTREVISION=   8
+PORTREVISION=   9
 CATEGORIES=	ftp
 DIST_SUBDIR=    wu-ftpd
 MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
@@ -22,15 +22,16 @@ PATCHFILES=     ftpglob.patch \
 
 MAINTAINER=	ache@FreeBSD.org
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip --enable-opie \
+		--enable-noop --disable-numericuid  --enable-nlst-dirs \
+		--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
+
 MAN1=		ftpcount.1 ftpwho.1
-MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
+MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 \
+		ftpservers.5
 MAN8=		ftpd.8 ftpshut.8 ftprestart.8 privatepw.8
 
-post-patch:
-	@${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h
-	@${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h
-
-do-build:
-	cd ${WRKSRC} && ./build fbs
+USE_AUTOCONF=   yes
 
 .include <bsd.port.mk>
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac
deleted file mode 100644
index 99ff3298ce0d..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-*** src/pathnames.h.orig	Wed Oct 20 20:27:34 1999
---- src/pathnames.h.noac	Wed Oct 20 20:30:19 1999
-***************
-*** 104,113 ****
-  #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers"
-  #endif
-  #else
-! #define _PATH_FTPUSERS   "/usr/local/lib/ftpd/ftpusers"
-! #define _PATH_FTPACCESS  "/usr/local/lib/ftpd/ftpaccess"
-! #define _PATH_CVT        "/usr/local/lib/ftpd/ftpconversions"
-! #define _PATH_PRIVATE    "/usr/local/lib/ftpd/ftpgroups"
-  #ifdef VIRTUAL
-  #define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers"
-  #endif
---- 104,113 ----
-  #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers"
-  #endif
-  #else
-! #define _PATH_FTPUSERS   "!!PREFIX!!/lib/ftpd/ftpusers"
-! #define _PATH_FTPACCESS  "!!PREFIX!!/lib/ftpd/ftpaccess"
-! #define _PATH_CVT        "!!PREFIX!!/lib/ftpd/ftpconversions"
-! #define _PATH_PRIVATE    "!!PREFIX!!/lib/ftpd/ftpgroups"
-  #ifdef VIRTUAL
-  #define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers"
-  #endif
-***************
-*** 203,209 ****
-  #ifdef USE_OPT_FTPD
-  #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
-  #endif
-  #endif
-  #endif
---- 203,209 ----
-  #ifdef USE_OPT_FTPD
-  #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
-  #endif
-  #endif
-  #endif
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ai b/ftp/wu-ftpd+ipv6/files/patch-ai
deleted file mode 100644
index 8faea955fd18..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ai
+++ /dev/null
@@ -1,46 +0,0 @@
---- config.h.noac.orig	Tue Oct  2 23:07:36 2001
-+++ config.h.noac	Tue Oct  2 23:08:15 2001
-@@ -109,9 +109,7 @@
-  * Add OPIE support -- REQUIRES OPIE libraries
-  */
- 
--#if !defined (LINUX)		/* Linux autodetects OPIE */
--#undef OPIE
--#endif
-+#define OPIE
- 
- /*
-  * ALTERNATE_CD
-@@ -132,7 +130,7 @@
-  * Define this if you want to use RFC 931 'authentication' - this improves
-  * the logging at the cost of a possible slight delay in connection.
-  */
--#undef USE_RFC931
-+#define USE_RFC931
- 
- /*
-  * BUFFER_SIZE
-@@ -232,7 +230,7 @@
-  * Undefine this to let NOOP reset the idle timeout.
-  */
- 
--#define IGNORE_NOOP
-+#undef IGNORE_NOOP
- 
- /*
-  * XFERLOG_REALPATH
-@@ -286,7 +284,7 @@
-  * the risk of PASV port race stealing the connection.  It also is non-RFC
-  * compliant, so it may cause problems for some client sites.
-  */
--#define FIGHT_PASV_PORT_RACE
-+#undef FIGHT_PASV_PORT_RACE
- 
- /*
-  * Define this to completely disable anonymous FTP access.
-@@ -387,4 +385,4 @@
-  * the NLST command enough to quell complains from Solaris command-
-  * line FTP client users.
-  */
--#undef NLST_SHOWS_DIRS
-+#define NLST_SHOWS_DIRS
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ao b/ftp/wu-ftpd+ipv6/files/patch-ao
deleted file mode 100644
index 217918b048bd..000000000000
--- a/ftp/wu-ftpd+ipv6/files/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
---- build.dist	Sun Oct 17 09:31:38 1999
-+++ build	Wed Oct 20 20:40:00 1999
-@@ -114,10 +114,10 @@
- 
- done
- 
--rm -f config.h
--ln -s config.h.noac config.h
--rm -f src/pathnames.h
--ln -s pathnames.h.noac src/pathnames.h
-+#rm -f config.h
-+#ln -s config.h.noac config.h
-+#rm -f src/pathnames.h
-+#ln -s pathnames.h.noac src/pathnames.h
- 
- echo 'make args are : '$makeargs''
- echo 'make opts are : '$makeopts''
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aq b/ftp/wu-ftpd+ipv6/files/patch-aq
new file mode 100644
index 000000000000..40f3c4e15144
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-aq
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Tue Feb  5 23:02:47 2002
++++ Makefile.in	Tue Feb  5 22:57:32 2002
+@@ -67,7 +67,7 @@
+ 	-@mkdir -p $(DESTDIR)/$(mandir)/man1
+ 	-@mkdir -p $(DESTDIR)/$(mandir)/man5
+ 	-@mkdir -p $(DESTDIR)/@ETCDIR@
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
++	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
+@@ -87,5 +87,8 @@
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
+-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
+-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpgroups $(DESTDIR)/@ETCDIR@/ftpgroups.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftphosts $(DESTDIR)/@ETCDIR@/ftphosts.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@ETCDIR@/ftpusers.example
diff --git a/ftp/wu-ftpd+ipv6/pkg-plist b/ftp/wu-ftpd+ipv6/pkg-plist
index d4111dea1125..9deb110f66c7 100644
--- a/ftp/wu-ftpd+ipv6/pkg-plist
+++ b/ftp/wu-ftpd+ipv6/pkg-plist
@@ -1,8 +1,9 @@
 bin/ftpcount
-bin/ftprestart
-bin/ftpshut
 bin/ftpwho
-bin/privatepw
+sbin/ckconfig
+sbin/ftprestart
+sbin/ftpshut
+sbin/privatepw
 etc/ftpaccess.example
 etc/ftpconversions.example
 etc/ftpgroups.example
diff --git a/ftp/wu-ftpd+ipv6/scripts/configure b/ftp/wu-ftpd+ipv6/scripts/configure
deleted file mode 100644
index ecea5f4297ea..000000000000
--- a/ftp/wu-ftpd+ipv6/scripts/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# configure,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp
-#
-
-mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
-sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index bbf6378a8a77..d0b4937e1d84 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	wu-ftpd
 PORTVERSION=	2.6.1
-PORTREVISION=   8
+PORTREVISION=   9
 CATEGORIES=	ftp
 DIST_SUBDIR=    wu-ftpd
 MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
@@ -22,15 +22,16 @@ PATCHFILES=     ftpglob.patch \
 
 MAINTAINER=	ache@FreeBSD.org
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip --enable-opie \
+		--enable-noop --disable-numericuid  --enable-nlst-dirs \
+		--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
+
 MAN1=		ftpcount.1 ftpwho.1
-MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
+MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5 \
+		ftpservers.5
 MAN8=		ftpd.8 ftpshut.8 ftprestart.8 privatepw.8
 
-post-patch:
-	@${CP} ${WRKSRC}/config.h.noac ${WRKSRC}/config.h
-	@${CP} ${WRKSRC}/src/pathnames.h.noac ${WRKSRC}/src/pathnames.h
-
-do-build:
-	cd ${WRKSRC} && ./build fbs
+USE_AUTOCONF=   yes
 
 .include <bsd.port.mk>
diff --git a/ftp/wu-ftpd/files/patch-ac b/ftp/wu-ftpd/files/patch-ac
deleted file mode 100644
index 99ff3298ce0d..000000000000
--- a/ftp/wu-ftpd/files/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-*** src/pathnames.h.orig	Wed Oct 20 20:27:34 1999
---- src/pathnames.h.noac	Wed Oct 20 20:30:19 1999
-***************
-*** 104,113 ****
-  #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers"
-  #endif
-  #else
-! #define _PATH_FTPUSERS   "/usr/local/lib/ftpd/ftpusers"
-! #define _PATH_FTPACCESS  "/usr/local/lib/ftpd/ftpaccess"
-! #define _PATH_CVT        "/usr/local/lib/ftpd/ftpconversions"
-! #define _PATH_PRIVATE    "/usr/local/lib/ftpd/ftpgroups"
-  #ifdef VIRTUAL
-  #define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers"
-  #endif
---- 104,113 ----
-  #define _PATH_FTPSERVERS "/opt/ftpd/lib/ftpservers"
-  #endif
-  #else
-! #define _PATH_FTPUSERS   "!!PREFIX!!/lib/ftpd/ftpusers"
-! #define _PATH_FTPACCESS  "!!PREFIX!!/lib/ftpd/ftpaccess"
-! #define _PATH_CVT        "!!PREFIX!!/lib/ftpd/ftpconversions"
-! #define _PATH_PRIVATE    "!!PREFIX!!/lib/ftpd/ftpgroups"
-  #ifdef VIRTUAL
-  #define _PATH_FTPSERVERS "/usr/local/lib/ftpd/ftpservers"
-  #endif
-***************
-*** 203,209 ****
-  #ifdef USE_OPT_FTPD
-  #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
-  #endif
-  #endif
-  #endif
---- 203,209 ----
-  #ifdef USE_OPT_FTPD
-  #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
-  #else
-! #define _PATH_FTPHOSTS  "!!PREFIX!!/etc/ftphosts"
-  #endif
-  #endif
-  #endif
diff --git a/ftp/wu-ftpd/files/patch-ai b/ftp/wu-ftpd/files/patch-ai
deleted file mode 100644
index 8faea955fd18..000000000000
--- a/ftp/wu-ftpd/files/patch-ai
+++ /dev/null
@@ -1,46 +0,0 @@
---- config.h.noac.orig	Tue Oct  2 23:07:36 2001
-+++ config.h.noac	Tue Oct  2 23:08:15 2001
-@@ -109,9 +109,7 @@
-  * Add OPIE support -- REQUIRES OPIE libraries
-  */
- 
--#if !defined (LINUX)		/* Linux autodetects OPIE */
--#undef OPIE
--#endif
-+#define OPIE
- 
- /*
-  * ALTERNATE_CD
-@@ -132,7 +130,7 @@
-  * Define this if you want to use RFC 931 'authentication' - this improves
-  * the logging at the cost of a possible slight delay in connection.
-  */
--#undef USE_RFC931
-+#define USE_RFC931
- 
- /*
-  * BUFFER_SIZE
-@@ -232,7 +230,7 @@
-  * Undefine this to let NOOP reset the idle timeout.
-  */
- 
--#define IGNORE_NOOP
-+#undef IGNORE_NOOP
- 
- /*
-  * XFERLOG_REALPATH
-@@ -286,7 +284,7 @@
-  * the risk of PASV port race stealing the connection.  It also is non-RFC
-  * compliant, so it may cause problems for some client sites.
-  */
--#define FIGHT_PASV_PORT_RACE
-+#undef FIGHT_PASV_PORT_RACE
- 
- /*
-  * Define this to completely disable anonymous FTP access.
-@@ -387,4 +385,4 @@
-  * the NLST command enough to quell complains from Solaris command-
-  * line FTP client users.
-  */
--#undef NLST_SHOWS_DIRS
-+#define NLST_SHOWS_DIRS
diff --git a/ftp/wu-ftpd/files/patch-ao b/ftp/wu-ftpd/files/patch-ao
deleted file mode 100644
index 217918b048bd..000000000000
--- a/ftp/wu-ftpd/files/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
---- build.dist	Sun Oct 17 09:31:38 1999
-+++ build	Wed Oct 20 20:40:00 1999
-@@ -114,10 +114,10 @@
- 
- done
- 
--rm -f config.h
--ln -s config.h.noac config.h
--rm -f src/pathnames.h
--ln -s pathnames.h.noac src/pathnames.h
-+#rm -f config.h
-+#ln -s config.h.noac config.h
-+#rm -f src/pathnames.h
-+#ln -s pathnames.h.noac src/pathnames.h
- 
- echo 'make args are : '$makeargs''
- echo 'make opts are : '$makeopts''
diff --git a/ftp/wu-ftpd/files/patch-aq b/ftp/wu-ftpd/files/patch-aq
new file mode 100644
index 000000000000..40f3c4e15144
--- /dev/null
+++ b/ftp/wu-ftpd/files/patch-aq
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Tue Feb  5 23:02:47 2002
++++ Makefile.in	Tue Feb  5 22:57:32 2002
+@@ -67,7 +67,7 @@
+ 	-@mkdir -p $(DESTDIR)/$(mandir)/man1
+ 	-@mkdir -p $(DESTDIR)/$(mandir)/man5
+ 	-@mkdir -p $(DESTDIR)/@ETCDIR@
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
++	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
+ 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
+@@ -87,5 +87,8 @@
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
+ 	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
+-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
+-	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpgroups $(DESTDIR)/@ETCDIR@/ftpgroups.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftphosts $(DESTDIR)/@ETCDIR@/ftphosts.example
++	@INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@ETCDIR@/ftpusers.example
diff --git a/ftp/wu-ftpd/pkg-plist b/ftp/wu-ftpd/pkg-plist
index d4111dea1125..9deb110f66c7 100644
--- a/ftp/wu-ftpd/pkg-plist
+++ b/ftp/wu-ftpd/pkg-plist
@@ -1,8 +1,9 @@
 bin/ftpcount
-bin/ftprestart
-bin/ftpshut
 bin/ftpwho
-bin/privatepw
+sbin/ckconfig
+sbin/ftprestart
+sbin/ftpshut
+sbin/privatepw
 etc/ftpaccess.example
 etc/ftpconversions.example
 etc/ftpgroups.example
diff --git a/ftp/wu-ftpd/scripts/configure b/ftp/wu-ftpd/scripts/configure
deleted file mode 100644
index ecea5f4297ea..000000000000
--- a/ftp/wu-ftpd/scripts/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# configure,v 1.1.1.1 1994/10/23 01:36:59 torstenb Exp
-#
-
-mv ${WRKSRC}/src/pathnames.h ${WRKSRC}/src/pathnames.h.bak
-sed <${WRKSRC}/src/pathnames.h.bak >${WRKSRC}/src/pathnames.h s+!!PREFIX!!+$PREFIX+g