From f32b2528cd7329fd6bc4181f51d51ba509018778 Mon Sep 17 00:00:00 2001
From: sergei <sergei@FreeBSD.org>
Date: Wed, 7 Jan 2004 19:24:15 +0000
Subject: - Update to 0.26 final release [1] - Use DOCSDIR and EXAMPLESDIR
 macros in pkg-plist - Use CONFIGURE_TARGET to silence a warning

PR:		61020 [1]
Submitted by:	maintainer
---
 net/portfwd/Makefile  | 11 ++++++-----
 net/portfwd/distinfo  |  2 +-
 net/portfwd/pkg-plist | 51 ++++++++++++++++++++++++++-------------------------
 3 files changed, 33 insertions(+), 31 deletions(-)

(limited to 'net/portfwd')

diff --git a/net/portfwd/Makefile b/net/portfwd/Makefile
index 188aaecb848e..4790c756f48c 100644
--- a/net/portfwd/Makefile
+++ b/net/portfwd/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	portfwd
-PORTVERSION=	0.26.r6
+PORTVERSION=	0.26
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+#DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	A Port Forwarding Daemon
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
@@ -23,11 +24,11 @@ MAN5=	portfwd.cfg.5
 MAN8=	portfwd.8
 
 .if defined(NOPORTDOCS)
-pre-install:
-	@${REINPLACE_CMD} -e "s|(^install-data-am:) install-docDATA|\1|g" \
+post-configure:
+	@${REINPLACE_CMD} -e "s|\(^install-data-am:\) install-docDATA|\1|g" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
-		"s|(^install-data-am: install-man) install-docDATA|\1|g" \
+		"s|\(^install-data-am: install-man\) install-docDATA|\1|g" \
 		${WRKSRC}/doc/Makefile
 .endif
 
diff --git a/net/portfwd/distinfo b/net/portfwd/distinfo
index 715da4ebfd1c..a18fb9c3517d 100644
--- a/net/portfwd/distinfo
+++ b/net/portfwd/distinfo
@@ -1 +1 @@
-MD5 (portfwd-0.26rc6.tar.gz) = 9706c8c4c4551c079f3e76abf985b64d
+MD5 (portfwd-0.26.tar.gz) = bd15556136f1067ed7440907372bf9c8
diff --git a/net/portfwd/pkg-plist b/net/portfwd/pkg-plist
index e84fc6e3f606..cadd57d64006 100644
--- a/net/portfwd/pkg-plist
+++ b/net/portfwd/pkg-plist
@@ -1,26 +1,27 @@
+@comment $FreeBSD$
 sbin/portfwd
-%%PORTDOCS%%share/doc/portfwd/COPYING
-%%PORTDOCS%%share/doc/portfwd/CREDITS
-%%PORTDOCS%%share/doc/portfwd/FAQ
-%%PORTDOCS%%share/doc/portfwd/README
-%%PORTDOCS%%share/doc/portfwd/TODO
-%%PORTDOCS%%share/doc/portfwd/conf.txt
-%%PORTDOCS%%@dirrm share/doc/portfwd
-share/examples/portfwd/alias.cfg
-share/examples/portfwd/bind-new.cfg
-share/examples/portfwd/bind.cfg
-share/examples/portfwd/chain.cfg
-share/examples/portfwd/debug_ftp.cfg
-share/examples/portfwd/dns.cfg
-share/examples/portfwd/empty.cfg
-share/examples/portfwd/external-director.cfg
-share/examples/portfwd/ftp.cfg
-share/examples/portfwd/load-balance.cfg
-share/examples/portfwd/mail.cfg
-share/examples/portfwd/portfwd1.cfg
-share/examples/portfwd/portfwd2.cfg
-share/examples/portfwd/single.cfg
-share/examples/portfwd/test.cfg
-share/examples/portfwd/udp.cfg
-share/examples/portfwd/x.cfg
-@dirrm share/examples/portfwd
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/conf.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/alias.cfg
+%%EXAMPLESDIR%%/bind-new.cfg
+%%EXAMPLESDIR%%/bind.cfg
+%%EXAMPLESDIR%%/chain.cfg
+%%EXAMPLESDIR%%/debug_ftp.cfg
+%%EXAMPLESDIR%%/dns.cfg
+%%EXAMPLESDIR%%/empty.cfg
+%%EXAMPLESDIR%%/external-director.cfg
+%%EXAMPLESDIR%%/ftp.cfg
+%%EXAMPLESDIR%%/load-balance.cfg
+%%EXAMPLESDIR%%/mail.cfg
+%%EXAMPLESDIR%%/portfwd1.cfg
+%%EXAMPLESDIR%%/portfwd2.cfg
+%%EXAMPLESDIR%%/single.cfg
+%%EXAMPLESDIR%%/test.cfg
+%%EXAMPLESDIR%%/udp.cfg
+%%EXAMPLESDIR%%/x.cfg
+@dirrm %%EXAMPLESDIR%%
-- 
cgit