- Upgrade to 0.42.

- Replace patche files with REINPLACE_CMD.

PR:		ports/100054
Submitted by:	chinsan <chinsan.tw at gmail.com>

5 files changed, 12 insertions, 46 deletions

diff --git a/ftp/tftp-hpa/Makefile b/ftp/tftp-hpa/Makefile
index 9485c38c8964..c4b7b3288b17 100644
--- a/ftp/tftp-hpa/Makefile
+++ b/ftp/tftp-hpa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tftp-hpa
-PORTVERSION=	0.41
+PORTVERSION=	0.42
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.kernel.org/pub/software/network/tftp/
 
@@ -24,4 +24,12 @@ MAN1=		tftp.1
 MAN8=		in.tftpd.8
 MLINKS=		in.tftpd.8 tftpd.8
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,SBINDIR,LIBEXECDIR,; s,sbindir,libexecdir,' \
+	    ${WRKSRC}/MCONFIG.in
+	@${REINPLACE_CMD} -e 's,SBINDIR,LIBEXECDIR,g' \
+	    ${WRKSRC}/tftpd/Makefile
+	@${REINPLACE_CMD} -e 's,LOG_DAEMON,LOG_FTP,g' \
+	    ${WRKSRC}/tftpd/tftpd.c
+
 .include <bsd.port.mk>
diff --git a/ftp/tftp-hpa/distinfo b/ftp/tftp-hpa/distinfo
index d7e4089c531a..5ea904cf344a 100644
--- a/ftp/tftp-hpa/distinfo
+++ b/ftp/tftp-hpa/distinfo
@@ -1,3 +1,3 @@
-MD5 (tftp-hpa-0.41.tar.bz2) = db286f988b040ba3e2e83e5df9f8ef38
-SHA256 (tftp-hpa-0.41.tar.bz2) = 26a4b78b748b2e40f574643fb630bacbc742e06685738681d2d8035f8ab31ef0
-SIZE (tftp-hpa-0.41.tar.bz2) = 81872
+MD5 (tftp-hpa-0.42.tar.bz2) = a6a21c51d74787f02ac4b2280d1fedb5
+SHA256 (tftp-hpa-0.42.tar.bz2) = f957c2340e367d62a90be1542cb80028ebbf5a5fb71fdb1935c05c000f79a3d1
+SIZE (tftp-hpa-0.42.tar.bz2) = 82367
diff --git a/ftp/tftp-hpa/files/patch-MCONFIG.in b/ftp/tftp-hpa/files/patch-MCONFIG.in
deleted file mode 100644
index a0dbd21b7d2d..000000000000
--- a/ftp/tftp-hpa/files/patch-MCONFIG.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- MCONFIG.in.orig	Tue Nov 27 02:18:11 2001
-+++ MCONFIG.in	Tue Jan 14 20:29:27 2003
-@@ -26,7 +26,7 @@
- MANDIR  = @mandir@
- 
- # System binaries
--SBINDIR = @sbindir@
-+LIBEXECDIR = @libexecdir@
- 
- # Binary suffixes
- O = @OBJEXT@
diff --git a/ftp/tftp-hpa/files/patch-tftpd::Makefile b/ftp/tftp-hpa/files/patch-tftpd::Makefile
deleted file mode 100644
index 2c4cb17b471d..000000000000
--- a/ftp/tftp-hpa/files/patch-tftpd::Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tftpd/Makefile.orig	Tue Jan 14 20:21:19 2003
-+++ tftpd/Makefile	Tue Jan 14 20:24:28 2003
-@@ -24,7 +24,7 @@
- 
- install: all
- 	mkdir -p $(INSTALLROOT)$(SBINDIR) $(INSTALLROOT)$(MANDIR)/man8
--	$(INSTALL_PROGRAM) tftpd$(X) $(INSTALLROOT)$(SBINDIR)/in.tftpd
-+	$(INSTALL_PROGRAM) tftpd$(X) $(INSTALLROOT)$(LIBEXECDIR)/in.tftpd
- 	$(INSTALL_DATA)    tftpd.8 $(INSTALLROOT)$(MANDIR)/man8/in.tftpd.8
- 	cd $(INSTALLROOT)$(MANDIR)/man8 && $(LN_S) -f in.tftpd.8 tftpd.8
- 
diff --git a/ftp/tftp-hpa/files/patch-tftpd_tftpd.c b/ftp/tftp-hpa/files/patch-tftpd_tftpd.c
deleted file mode 100644
index 16809a70fb5c..000000000000
--- a/ftp/tftp-hpa/files/patch-tftpd_tftpd.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tftpd/tftpd.c.orig
-+++ tftpd/tftpd.c
-@@ -292,7 +292,7 @@
-   p = strrchr(argv[0], '/');
-   __progname = (p && p[1]) ? p+1 : argv[0];
-   
--  openlog(__progname, LOG_PID|LOG_NDELAY, LOG_DAEMON);
-+  openlog(__progname, LOG_PID|LOG_NDELAY, LOG_FTP);
-   
-   while ((c = getopt(argc, argv, "cspvVla:B:u:U:r:t:T:m:")) != -1)
-     switch (c) {