diff options
| author | beech <beech@FreeBSD.org> | 2008-09-25 06:09:23 +0800 |
|---|---|---|
| committer | beech <beech@FreeBSD.org> | 2008-09-25 06:09:23 +0800 |
| commit | a66ce4ebdacc17ebcd275c2fe2bdc74aa0faae6e (patch) | |
| tree | 31ec52fe9346181fffaf19b9e9514f7b146574d7 /ftp | |
| parent | 89194f8bd6529b31fc0c5786db2edaacdf52e470 (diff) | |
| download | freebsd-ports-graphics-a66ce4ebdacc17ebcd275c2fe2bdc74aa0faae6e.tar.gz freebsd-ports-graphics-a66ce4ebdacc17ebcd275c2fe2bdc74aa0faae6e.tar.zst freebsd-ports-graphics-a66ce4ebdacc17ebcd275c2fe2bdc74aa0faae6e.zip | |
- Replace path hack with configure arg
- Update proftpd.conf to reflect changes listed in UPDATING
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 fc25ba16b33..0a177300b25 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 90ccbf9aff4..b32fb3003bc 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 |