From 0e14e60e628b3c78eaef72c75bfb5907a268a6e5 Mon Sep 17 00:00:00 2001
From: Michael Haro <mharo@FreeBSD.org>
Date: Thu, 13 Jun 2002 21:00:23 +0000
Subject: update to 1.2.5

---
 ftp/proftpd-devel/Makefile        | 10 +++++++---
 ftp/proftpd-devel/distinfo        |  2 +-
 ftp/proftpd-devel/files/patch-pam | 22 +++++++++++-----------
 ftp/proftpd-devel/pkg-plist       |  2 +-
 ftp/proftpd/Makefile              | 10 +++++++---
 ftp/proftpd/distinfo              |  2 +-
 ftp/proftpd/files/patch-pam       | 22 +++++++++++-----------
 ftp/proftpd/pkg-plist             |  2 +-
 8 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index b816607772e6..6e04a62c27df 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://ftp.stikman.com/pub/proftpd/source/ \
 		ftp://ftp.dataguard.no/pub/proftpd/distrib/source/ \
 		ftp://ftp.club-internet.fr/pub/mirrors/ftp.proftpd.org/distrib/source/
+DISTNAME=	${PORTNAME}-1.2.5
 
 MAINTAINER=	mharo@FreeBSD.org
 
@@ -78,6 +78,10 @@ pre-configure:
 	@${ECHO_MSG} "==> Configuring with ${MODULES}"
 
 post-configure:
+	@${MV} ${WRKSRC}/Make.rules ${WRKSRC}/Make.rules.pre_sed
+	@${SED}	-e 's: -lnsl::' \
+		< ${WRKSRC}/Make.rules.pre_sed > ${WRKSRC}/Make.rules
+
 	@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
 	@${SED}	-e 's:/etc:${PREFIX}/etc:' \
 		-e 's:/usr/sbin/proftpd:${PREFIX}/libexec/proftpd:' \
@@ -114,7 +118,7 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/proftpd
 	@${INSTALL_DATA} ${WRKSRC}/doc/Configuration.html ${PREFIX}/share/doc/proftpd
-	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ-config.html ${PREFIX}/share/doc/proftpd
+	@${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${PREFIX}/share/doc/proftpd
 .endif
 
 .if !defined(WITHOUT_PAM)
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index ab4b1defdfac..e65cd88b089e 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.2.4.tar.bz2) = 98570c48e3187ddaac385e33e0765c74
+MD5 (proftpd-1.2.5.tar.bz2) = 100a374dfcaa4852cb767dc6afeb4277
diff --git a/ftp/proftpd-devel/files/patch-pam b/ftp/proftpd-devel/files/patch-pam
index ad29307da719..1f79c4f0afa6 100644
--- a/ftp/proftpd-devel/files/patch-pam
+++ b/ftp/proftpd-devel/files/patch-pam
@@ -17,17 +17,17 @@
  
  Linux:
  To use PAM with ProFTPD, you must edit /etc/pam.d/ftp and add the
---- ./doc/Configuration.html.orig	Mon Jan 21 16:28:02 2002
-+++ ./doc/Configuration.html	Mon Jan 21 16:28:13 2002
-@@ -712,7 +712,7 @@
- <hr>
- <h2><a name="AuthPAMConfig">AuthPAMConfig</a></h2>
- <p><strong>Syntax:</strong> AuthPAMConfig <em>service</em><br>
--  <strong>Default:</strong> ftp<br>
-+  <strong>Default:</strong> ftpd<br>
-   <strong>Context:</strong> server config,&lt;VirtualHost&gt;, &lt;Global&gt;<br>
-   <STRONG>Module:</STRONG> mod_pam<BR>
-   <strong>Compatibility:</strong> 1.2.0rc1 and later</p>
+--- doc/Configuration.html.orig	Wed May 22 10:08:15 2002
++++ doc/Configuration.html	Sat Jun  1 10:30:54 2002
+@@ -3806,7 +3806,7 @@
+ ></DT
+ ><DD
+ ><P
+->ftp</P
++>ftpd</P
+ ></DD
+ ><DT
+ ><PRE
 --- ./modules/mod_pam.c.orig	Mon Jan 21 16:28:51 2002
 +++ ./modules/mod_pam.c	Mon Jan 21 16:29:03 2002
 @@ -48,7 +48,7 @@
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
index 8f8696656dc3..0fcaf3e517a4 100644
--- a/ftp/proftpd-devel/pkg-plist
+++ b/ftp/proftpd-devel/pkg-plist
@@ -7,5 +7,5 @@ etc/rc.d/proftpd.sh.sample
 libexec/proftpd
 sbin/ftpshut
 share/doc/proftpd/Configuration.html
-share/doc/proftpd/FAQ-config.html
+share/doc/proftpd/faq.html
 @dirrm share/doc/proftpd
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index b816607772e6..6e04a62c27df 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://ftp.stikman.com/pub/proftpd/source/ \
 		ftp://ftp.dataguard.no/pub/proftpd/distrib/source/ \
 		ftp://ftp.club-internet.fr/pub/mirrors/ftp.proftpd.org/distrib/source/
+DISTNAME=	${PORTNAME}-1.2.5
 
 MAINTAINER=	mharo@FreeBSD.org
 
@@ -78,6 +78,10 @@ pre-configure:
 	@${ECHO_MSG} "==> Configuring with ${MODULES}"
 
 post-configure:
+	@${MV} ${WRKSRC}/Make.rules ${WRKSRC}/Make.rules.pre_sed
+	@${SED}	-e 's: -lnsl::' \
+		< ${WRKSRC}/Make.rules.pre_sed > ${WRKSRC}/Make.rules
+
 	@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
 	@${SED}	-e 's:/etc:${PREFIX}/etc:' \
 		-e 's:/usr/sbin/proftpd:${PREFIX}/libexec/proftpd:' \
@@ -114,7 +118,7 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/proftpd
 	@${INSTALL_DATA} ${WRKSRC}/doc/Configuration.html ${PREFIX}/share/doc/proftpd
-	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ-config.html ${PREFIX}/share/doc/proftpd
+	@${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${PREFIX}/share/doc/proftpd
 .endif
 
 .if !defined(WITHOUT_PAM)
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index ab4b1defdfac..e65cd88b089e 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.2.4.tar.bz2) = 98570c48e3187ddaac385e33e0765c74
+MD5 (proftpd-1.2.5.tar.bz2) = 100a374dfcaa4852cb767dc6afeb4277
diff --git a/ftp/proftpd/files/patch-pam b/ftp/proftpd/files/patch-pam
index ad29307da719..1f79c4f0afa6 100644
--- a/ftp/proftpd/files/patch-pam
+++ b/ftp/proftpd/files/patch-pam
@@ -17,17 +17,17 @@
  
  Linux:
  To use PAM with ProFTPD, you must edit /etc/pam.d/ftp and add the
---- ./doc/Configuration.html.orig	Mon Jan 21 16:28:02 2002
-+++ ./doc/Configuration.html	Mon Jan 21 16:28:13 2002
-@@ -712,7 +712,7 @@
- <hr>
- <h2><a name="AuthPAMConfig">AuthPAMConfig</a></h2>
- <p><strong>Syntax:</strong> AuthPAMConfig <em>service</em><br>
--  <strong>Default:</strong> ftp<br>
-+  <strong>Default:</strong> ftpd<br>
-   <strong>Context:</strong> server config,&lt;VirtualHost&gt;, &lt;Global&gt;<br>
-   <STRONG>Module:</STRONG> mod_pam<BR>
-   <strong>Compatibility:</strong> 1.2.0rc1 and later</p>
+--- doc/Configuration.html.orig	Wed May 22 10:08:15 2002
++++ doc/Configuration.html	Sat Jun  1 10:30:54 2002
+@@ -3806,7 +3806,7 @@
+ ></DT
+ ><DD
+ ><P
+->ftp</P
++>ftpd</P
+ ></DD
+ ><DT
+ ><PRE
 --- ./modules/mod_pam.c.orig	Mon Jan 21 16:28:51 2002
 +++ ./modules/mod_pam.c	Mon Jan 21 16:29:03 2002
 @@ -48,7 +48,7 @@
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index 8f8696656dc3..0fcaf3e517a4 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -7,5 +7,5 @@ etc/rc.d/proftpd.sh.sample
 libexec/proftpd
 sbin/ftpshut
 share/doc/proftpd/Configuration.html
-share/doc/proftpd/FAQ-config.html
+share/doc/proftpd/faq.html
 @dirrm share/doc/proftpd
-- 
cgit v1.2.3