Remove broken "pre-patch" target, let "pathnames.h" use a macro

"PREFIX" and make sure it gets defined.

3 files changed, 21 insertions, 36 deletions

diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 1e6698e68d6..6a45224d656 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $NetBSD: Makefile,v 1.2 1998/03/29 21:45:26 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/03/30 18:40:25 tron Exp $
 # $FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
@@ -16,20 +16,13 @@ CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/private/
 EXTRACT_SUFX=   .tar.Z
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=     rh@vip.at
 
 MAN1=		ftpcount.1 ftpwho.1
 MAN5=		ftpaccess.5 ftphosts.5 ftpconversions.5 xferlog.5
 MAN8=		ftpd.8 ftpshut.8
 
-pre-patch:
-	@cd patches ; for i in ?? ;\
-	do \
-	  sed 's/!!PREFIX!!/${PREFIX:S/\//!!/g}/g' <$$i | \
-	  sed 's/!!/\//g' >patch-$$i; \
-	done
-
 do-build:
-	cd ${WRKSRC} && ./build nbs
+	cd ${WRKSRC} && ./build nbs PREFIX=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/net/wu-ftpd/patches/patch-ab b/net/wu-ftpd/patches/patch-ab
index 0588b1ac984..32af5c3368a 100644
--- a/net/wu-ftpd/patches/patch-ab
+++ b/net/wu-ftpd/patches/patch-ab
@@ -16,10 +16,10 @@
   #define _PATH_CVT       "/etc/ftpd/ftpconversions"
   #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
   #else
-! #define _PATH_FTPUSERS  "/usr/pkg/etc/ftpusers"
-! #define _PATH_FTPACCESS "/usr/pkg/etc/ftpaccess"
-! #define _PATH_CVT       "/usr/pkg/etc/ftpconversions"
-! #define _PATH_PRIVATE   "/usr/pkg/etc/ftpgroups"
+! #define _PATH_FTPUSERS  PREFIX "/etc/ftpusers"
+! #define _PATH_FTPACCESS PREFIX "/etc/ftpaccess"
+! #define _PATH_CVT       PREFIX "/etc/ftpconversions"
+! #define _PATH_PRIVATE   PREFIX "/etc/ftpgroups"
   #endif
   #endif
   
@@ -39,10 +39,10 @@
   #endif
   #else
   #ifndef _PATH_PIDNAMES
-! #define _PATH_PIDNAMES  "/usr/pkg/lib/ftpd/pids/%s"
+! #define _PATH_PIDNAMES  "/var/run/%s"
   #endif
   #ifndef _PATH_XFERLOG
-! #define _PATH_XFERLOG   "/usr/pkg/logs/xferlog"
+! #define _PATH_XFERLOG   "/var/logs/xferlog"
   #endif
   #endif
   
@@ -59,7 +59,7 @@
   #ifdef USE_ETC_FTPD
   #define _PATH_FTPHOSTS  "/etc/ftpd/ftphosts"
   #else
-! #define _PATH_FTPHOSTS  "/usr/pkg/etc/ftphosts"
+! #define _PATH_FTPHOSTS  PREFIX "/etc/ftphosts"
   #endif
   #endif
   #endif
diff --git a/net/wu-ftpd/patches/patch-ag b/net/wu-ftpd/patches/patch-ag
index 510f2050827..bc452f31f5d 100644
--- a/net/wu-ftpd/patches/patch-ag
+++ b/net/wu-ftpd/patches/patch-ag
@@ -1,19 +1,11 @@
-*** src/makefiles/Makefile.nbs.orig	Mon Mar  2 19:24:23 1998
---- src/makefiles/Makefile.nbs	Mon Mar  2 19:24:44 1998
-***************
-*** 5,11 ****
-  CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support
-! CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lcrypt
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
---- 5,11 ----
-  CC       = cc
-  IFLAGS   = -I.. -I../support
-  LFLAGS   = -L../support
-! CFLAGS  += ${IFLAGS} ${LFLAGS}
-  LIBES    = -lsupport -lcrypt
-  LIBC     = /usr/lib/libc.a
-  LINTFLAGS=	
+--- src/makefiles/Makefile.nbs.orig	Tue Aug 12 05:43:42 1997
++++ src/makefiles/Makefile.nbs	Mon Mar 30 20:22:01 1998
+@@ -5,7 +5,7 @@
+ CC       = cc
+ IFLAGS   = -I.. -I../support
+ LFLAGS   = -L../support
+-CFLAGS   = -O ${IFLAGS} ${LFLAGS}
++CFLAGS  += ${IFLAGS} ${LFLAGS} -DPREFIX=\"${PREFIX}\"
+ LIBES    = -lsupport -lcrypt
+ LIBC     = /usr/lib/libc.a
+ LINTFLAGS=