aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharo <mharo@FreeBSD.org>1999-08-23 08:00:19 +0800
committermharo <mharo@FreeBSD.org>1999-08-23 08:00:19 +0800
commit4efb41fcdd97e8a1f26fdd461f2f02f5ead0e4a8 (patch)
tree1e878968d93eaf1275c74fa0a302b3da3554a5c7
parente36f9dbee84ccfd7ed078050303a76b569d0ead0 (diff)
downloadfreebsd-ports-gnome-4efb41fcdd97e8a1f26fdd461f2f02f5ead0e4a8.tar.gz
freebsd-ports-gnome-4efb41fcdd97e8a1f26fdd461f2f02f5ead0e4a8.tar.zst
freebsd-ports-gnome-4efb41fcdd97e8a1f26fdd461f2f02f5ead0e4a8.zip
update to 1.2.0pre3a
Submitted by: Jeremy Chadwick yoshi@parodius.com PR: 13230
-rw-r--r--ftp/proftpd-devel/Makefile11
-rw-r--r--ftp/proftpd-devel/distinfo1
-rw-r--r--ftp/proftpd-devel/pkg-plist3
-rw-r--r--ftp/proftpd/Makefile11
-rw-r--r--ftp/proftpd/distinfo1
-rw-r--r--ftp/proftpd/pkg-plist3
6 files changed, 24 insertions, 6 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 0a104307a941..59a4db8491fd 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -3,7 +3,7 @@
# Date created: 26 January 1998
# Whom: Stephane Legrand
#
-# $Id: Makefile,v 1.12 1999/04/22 16:01:10 mharo Exp $
+# $Id: Makefile,v 1.13 1999/08/02 10:43:56 asami Exp $
#
DISTNAME= proftpd-1.2.0pre3
@@ -12,6 +12,10 @@ CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/ \
ftp://ftp3.proftpd.org/distrib/
+PATCH_SITES= ftp://ftp.tos.net/pub/proftpd/
+PATCHFILES= proftpd-1.2.0pre3a.patch.gz
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= mharo@FreeBSD.org
MAN1= ftpcount.1
@@ -40,6 +44,7 @@ post-configure:
@${SED} -e 's:/usr/bin:${PREFIX}/bin:' \
< ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1
+STRIP=
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
@${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
@@ -47,9 +52,11 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
@${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
+ @${INSTALL_SCRIPT} \
+ ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf.default
@if [ ! -f ${PREFIX}/etc/proftpd.conf ]; then \
${INSTALL_SCRIPT} \
- ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
+ ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
fi
.include <bsd.port.mk>
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 7dd01454b3b6..1b84f6287b27 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1 +1,2 @@
MD5 (proftpd-1.2.0pre3.tar.gz) = 60b8dc1ffd656a0c6823e83dc07aaecb
+MD5 (proftpd-1.2.0pre3a.patch.gz) = 77615026fa30edf24eaa1764ae1272b2
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
index a52e4bf17bfb..e5b7471828b1 100644
--- a/ftp/proftpd-devel/pkg-plist
+++ b/ftp/proftpd-devel/pkg-plist
@@ -1,4 +1,5 @@
bin/ftpcount
-etc/proftpd.conf
+etc/proftpd.conf.default
+@exec if [ ! -f %D/etc/proftpd.conf ] ; then cp -p %D/%F %B/proftpd.conf; fi
libexec/proftpd
sbin/ftpshut
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 0a104307a941..59a4db8491fd 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -3,7 +3,7 @@
# Date created: 26 January 1998
# Whom: Stephane Legrand
#
-# $Id: Makefile,v 1.12 1999/04/22 16:01:10 mharo Exp $
+# $Id: Makefile,v 1.13 1999/08/02 10:43:56 asami Exp $
#
DISTNAME= proftpd-1.2.0pre3
@@ -12,6 +12,10 @@ CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/ \
ftp://ftp3.proftpd.org/distrib/
+PATCH_SITES= ftp://ftp.tos.net/pub/proftpd/
+PATCHFILES= proftpd-1.2.0pre3a.patch.gz
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= mharo@FreeBSD.org
MAN1= ftpcount.1
@@ -40,6 +44,7 @@ post-configure:
@${SED} -e 's:/usr/bin:${PREFIX}/bin:' \
< ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1
+STRIP=
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
@${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
@@ -47,9 +52,11 @@ do-install:
@${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
@${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
+ @${INSTALL_SCRIPT} \
+ ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf.default
@if [ ! -f ${PREFIX}/etc/proftpd.conf ]; then \
${INSTALL_SCRIPT} \
- ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
+ ${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
fi
.include <bsd.port.mk>
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 7dd01454b3b6..1b84f6287b27 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1 +1,2 @@
MD5 (proftpd-1.2.0pre3.tar.gz) = 60b8dc1ffd656a0c6823e83dc07aaecb
+MD5 (proftpd-1.2.0pre3a.patch.gz) = 77615026fa30edf24eaa1764ae1272b2
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index a52e4bf17bfb..e5b7471828b1 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -1,4 +1,5 @@
bin/ftpcount
-etc/proftpd.conf
+etc/proftpd.conf.default
+@exec if [ ! -f %D/etc/proftpd.conf ] ; then cp -p %D/%F %B/proftpd.conf; fi
libexec/proftpd
sbin/ftpshut