? proftpd-relooking.diff
? proftpd.diff
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/proftpd/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- Makefile	20 Apr 2005 00:24:49 -0000	1.74
+++ Makefile	17 Jun 2005 14:45:36 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -16,14 +16,13 @@
 		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
 		ftp://ftp.ethereal.com/mirrors/ftp.proftpd.org/distrib/source/ \
 		ftp://mirror.cybercomm.nl/pub/proftpd/distrib/source/
-DISTNAME=	${PORTNAME}-1.2.10
 
 MAINTAINER?=	mharo@FreeBSD.org
 COMMENT?=	Highly configurable ftp daemon
 
 MAN1=	ftpcount.1 ftpwho.1 ftptop.1
 MAN5=	xferlog.5
-MAN8=	proftpd.8 ftpshut.8
+MAN8=	proftpd.8 ftpshut.8 ftpdctl.8
 
 PORTDOCSdoc=	Configuration.html faq.html
 PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \
@@ -33,19 +32,12 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 
-SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
-
-USE_RC_SUBR=	yes
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
-		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
-PLIST_SUB+=	RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX}
+USE_RC_SUBR=	proftpd.sh
 
 CONFIGURE_ARGS=	--localstatedir=/var/run \
+		--sysconfdir=${EXAMPLESDIR}/etc \
 		--disable-sendfile
 
 OPTIONS=	IPV6 "Use IPv6" off \
@@ -175,47 +167,15 @@
 	@${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:/usr/sbin/proftpd:${PREFIX}/libexec/proftpd:' \
-		-e 's:/usr/sbin:${PREFIX}/sbin:' \
+	${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules
+	${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \
 		-e 's:/usr/bin:${PREFIX}/bin:' \
-		< ${WRKSRC}/src/proftpd.8.pre_sed > ${WRKSRC}/src/proftpd.8
+		${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \
+		${WRKSRC}/utils/ftpcount.1
 
-	@${MV} ${WRKSRC}/utils/ftpshut.8 ${WRKSRC}/utils/ftpshut.8.pre_sed
-	@${SED}	-e 's:/usr/sbin:${PREFIX}/sbin:' \
-		-e 's:/etc:/var/run:' \
-		< ${WRKSRC}/utils/ftpshut.8.pre_sed > ${WRKSRC}/utils/ftpshut.8
-
-	@${MV} ${WRKSRC}/utils/ftpcount.1 ${WRKSRC}/utils/ftpcount.1.pre_sed
-	@${SED}	-e 's:/usr/bin:${PREFIX}/bin:' \
-		< ${WRKSRC}/utils/ftpcount.1.pre_sed > ${WRKSRC}/utils/ftpcount.1
-
-post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/proftpd.sh > ${WRKSRC}/proftpd.sh
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftpwho ${PREFIX}/bin/ftpwho
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftptop ${PREFIX}/bin/ftptop
-	@${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut
-	@${INSTALL_MAN} ${WRKSRC}/utils/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
-	@${INSTALL_MAN} ${WRKSRC}/utils/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1
-	@${INSTALL_MAN} ${WRKSRC}/utils/ftptop.1 ${PREFIX}/man/man1/ftptop.1
-	@${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5/xferlog.5
-	@${INSTALL_MAN} ${WRKSRC}/utils/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
-	@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
-	@${INSTALL_DATA} \
-		${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf.default
-	@if [ ! -f ${PREFIX}/etc/proftpd.conf ]; then \
-		${INSTALL_DATA} \
-		${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
-	fi
-	@${INSTALL_SCRIPT} ${WRKSRC}/proftpd.sh ${PREFIX}/etc/rc.d/proftpd${RC_SUFX}
+post-install:
+	[ -f ${PREFIX}/etc/proftpd.conf ] || \
+		${CP} ${EXAMPLESDIR}/etc/proftpd.conf ${PREFIX}/etc/proftpd.conf
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/proftpd
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/proftpd/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist	11 Jan 2004 11:54:29 -0000	1.12
+++ pkg-plist	17 Jun 2005 14:45:36 -0000
@@ -1,9 +1,12 @@
-@unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.default; then rm -f %D/etc/proftpd.conf; fi
 bin/ftpcount
+bin/ftpdctl
 bin/ftptop
 bin/ftpwho
-etc/proftpd.conf.default
-etc/rc.d/proftpd%%RC_SUFX%%
+@unexec if cmp -s %D/etc/proftpd.conf %D/%%EXAMPLESDIR%%/etc/proftpd.conf; then rm -f %D/etc/proftpd.conf; fi
+%%EXAMPLESDIR%%/etc/proftpd.conf
 @exec if [ ! -f %D/etc/proftpd.conf ] ; then cp -p %D/%F %B/proftpd.conf; fi
-libexec/proftpd
 sbin/ftpshut
+sbin/in.proftpd
+sbin/proftpd
+@dirrm %%EXAMPLESDIR%%/etc
+@dirrm %%EXAMPLESDIR%%
Index: files/patch-aa
===================================================================
RCS file: files/patch-aa
diff -N files/patch-aa
--- files/patch-aa	24 Mar 2003 13:33:28 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
---- ./sample-configurations/basic.conf.orig	Tue Feb 18 03:16:20 2003
-+++ ./sample-configurations/basic.conf	Thu Mar 13 11:54:35 2003
-@@ -1,3 +1,7 @@
-+#
-+# To have more informations about Proftpd configuration
-+# look at : http://www.proftpd.org/
-+#
- # This is a basic ProFTPD configuration file (rename it to 
- # 'proftpd.conf' for actual use.  It establishes a single server
- # and a single anonymous login.  It assumes that you have a user/group
-@@ -37,23 +41,29 @@
- 
- # A basic anonymous configuration, no upload directories.  If you do not
- # want anonymous users, simply delete this entire <Anonymous> section.
--<Anonymous ~ftp>
--  User				ftp
--  Group				ftp
--
--  # We want clients to be able to login with "anonymous" as well as "ftp"
--  UserAlias			anonymous ftp
--
--  # Limit the maximum number of anonymous logins
--  MaxClients			10
--
--  # We want 'welcome.msg' displayed at login, and '.message' displayed
--  # in each newly chdired directory.
--  DisplayLogin			welcome.msg
--  DisplayFirstChdir		.message
--
--  # Limit WRITE everywhere in the anonymous chroot
--  <Limit WRITE>
--    DenyAll
--  </Limit>
--</Anonymous>
-+#########################################################################
-+#                                                                       #
-+# Uncomment lines with only one # to allow basic anonymous access       #
-+#                                                                       #
-+#########################################################################
-+
-+#<Anonymous ~ftp>
-+#   User				ftp
-+#   Group				ftp
-+
-+  ### We want clients to be able to login with "anonymous" as well as "ftp"
-+  # UserAlias			anonymous ftp
-+
-+  ### Limit the maximum number of anonymous logins
-+  # MaxClients			10
-+
-+  ### We want 'welcome.msg' displayed at login, and '.message' displayed
-+  ### in each newly chdired directory.
-+  # DisplayLogin			welcome.msg
-+  # DisplayFirstChdir		.message
-+
-+  ### Limit WRITE everywhere in the anonymous chroot
-+  # <Limit WRITE>
-+  #   DenyAll
-+  # </Limit>
-+#</Anonymous>
Index: files/patch-sample-configurations_basic.conf
===================================================================
RCS file: files/patch-sample-configurations_basic.conf
diff -N files/patch-sample-configurations_basic.conf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-sample-configurations_basic.conf	17 Jun 2005 14:45:36 -0000
@@ -0,0 +1,68 @@
+--- sample-configurations/basic.conf.orig	Fri Jun 17 15:10:06 2005
++++ sample-configurations/basic.conf	Fri Jun 17 15:10:43 2005
+@@ -1,3 +1,7 @@
++#
++# To have more informations about Proftpd configuration
++# look at : http://www.proftpd.org/
++#
+ # This is a basic ProFTPD configuration file (rename it to 
+ # 'proftpd.conf' for actual use.  It establishes a single server
+ # and a single anonymous login.  It assumes that you have a user/group
+@@ -6,6 +10,7 @@
+ ServerName			"ProFTPD Default Installation"
+ ServerType			standalone
+ DefaultServer			on
++ScoreboardFile			/var/run/proftpd.scoreboard
+ 
+ # Port 21 is the standard FTP port.
+ Port				21
+@@ -40,23 +45,29 @@
+ 
+ # A basic anonymous configuration, no upload directories.  If you do not
+ # want anonymous users, simply delete this entire <Anonymous> section.
+-<Anonymous ~ftp>
+-  User				ftp
+-  Group				ftp
+-
+-  # We want clients to be able to login with "anonymous" as well as "ftp"
+-  UserAlias			anonymous ftp
+-
+-  # Limit the maximum number of anonymous logins
+-  MaxClients			10
+-
+-  # We want 'welcome.msg' displayed at login, and '.message' displayed
+-  # in each newly chdired directory.
+-  DisplayLogin			welcome.msg
+-  DisplayFirstChdir		.message
+-
+-  # Limit WRITE everywhere in the anonymous chroot
+-  <Limit WRITE>
+-    DenyAll
+-  </Limit>
+-</Anonymous>
++#########################################################################
++#                                                                       #
++# Uncomment lines with only one # to allow basic anonymous access       #
++#                                                                       #
++#########################################################################
++
++#<Anonymous ~ftp>
++#   User				ftp
++#   Group				ftp
++
++  ### We want clients to be able to login with "anonymous" as well as "ftp"
++  # UserAlias			anonymous ftp
++
++  ### Limit the maximum number of anonymous logins
++  # MaxClients			10
++
++  ### We want 'welcome.msg' displayed at login, and '.message' displayed
++  ### in each newly chdired directory.
++  # DisplayLogin			welcome.msg
++  # DisplayFirstChdir		.message
++
++  ### Limit WRITE everywhere in the anonymous chroot
++  # <Limit WRITE>
++  #   DenyAll
++  # </Limit>
++#</Anonymous>
Index: files/proftpd.sh
===================================================================
RCS file: files/proftpd.sh
diff -N files/proftpd.sh
--- files/proftpd.sh	3 Nov 2003 19:40:38 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/ftp/proftpd/files/proftpd.sh,v 1.1 2003/11/03 19:40:38 mharo Exp $
-#
-
-# PROVIDE: proftpd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable proftpd:
-#
-#proftpd_enable="YES"
-#
-# See proftpd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=proftpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/proftpd
-pidfile=/var/run/proftpd.pid
-required_files=%%PREFIX%%/etc/proftpd.conf
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-# set defaults
-
-proftpd_enable=${proftpd_enable:-"NO"}
-proftpd_flags=${proftpd_flags:-""}
-
-load_rc_config $name
-run_rc_command "$1"
Index: files/proftpd.sh.in
===================================================================
RCS file: files/proftpd.sh.in
diff -N files/proftpd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/proftpd.sh.in	17 Jun 2005 14:45:36 -0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: proftpd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable proftpd:
+#
+#proftpd_enable="YES"
+#
+# See proftpd(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=proftpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/proftpd
+pidfile=/var/run/proftpd.pid
+required_files=%%PREFIX%%/etc/proftpd.conf
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+proftpd_enable=${proftpd_enable:-"NO"}
+proftpd_flags=${proftpd_flags:-""}
+
+load_rc_config $name
+run_rc_command "$1"