diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2008-09-24 22:09:23 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2008-09-24 22:09:23 +0000 |
| commit | 56794e1fb7c851eaf2be2fe8d318189792d1b287 (patch) | |
| tree | ce9b66acf05b17f69ceffabdc73afa3d30fd6427 /ftp | |
| parent | fbe09b08cdef3c5b1ece1a00e2b3667f7e2af94c (diff) | |
- Replace path hack with configure arg
- Update proftpd.conf to reflect changes listed in UPDATING
Notes
Notes:
svn path=/head/; revision=220732
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd/Makefile | 5 | ||||
| -rw-r--r-- | ftp/proftpd/files/patch-sample-configurations_basic.conf | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index fc25ba16b337..0a177300b25e 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -57,6 +57,7 @@ CONFLICTS= proftpd-devel-1.[0-9].* USE_RC_SUBR= proftpd.sh CONFIGURE_ARGS= --localstatedir=/var/run \ + --with-pkgconfig=libdata/pkgconfig \ --sysconfdir=${PREFIX}/etc \ --disable-sendfile @@ -271,7 +272,7 @@ post-patch: ${WRKSRC}/contrib/mod_ldap.c .endif @${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in - + pre-configure: @${ECHO_MSG} "==> Configuring with ${MODULES}" @@ -283,8 +284,6 @@ post-configure: ${WRKSRC}/utils/ftpcount.1 post-install: - @${MV} ${PREFIX}/lib/pkgconfig/proftpd.pc ${PREFIX}/libdata/pkgconfig - @${RM} -rf ${PREFIX}/lib/pkgconfig @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR}/ diff --git a/ftp/proftpd/files/patch-sample-configurations_basic.conf b/ftp/proftpd/files/patch-sample-configurations_basic.conf index 90ccbf9aff48..b32fb3003bc7 100644 --- a/ftp/proftpd/files/patch-sample-configurations_basic.conf +++ b/ftp/proftpd/files/patch-sample-configurations_basic.conf @@ -12,7 +12,7 @@ ServerName "ProFTPD Default Installation" ServerType standalone DefaultServer on -+ScoreboardFile /var/run/proftpd.scoreboard ++ScoreboardFile /var/run/proftpd/proftpd.scoreboard # Port 21 is the standard FTP port. Port 21 |