Make portlint happier

Fix plist
Fix build as non-root

3 files changed, 25 insertions, 48 deletions

diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 993865741930..cc0bb3dfbaa1 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -5,7 +5,7 @@ PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
-PORTREVISION?=	0	
+PORTREVISION?=	1
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \
@@ -48,7 +48,7 @@ PORTDOCS=	*
 .endif
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		gmake
+USES=		gmake libtool
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 
@@ -67,6 +67,9 @@ CONFIGURE_ARGS=--localstatedir=${LOCALSTATEDIR} \
 		--enable-dso \
 		--disable-sendfile
 
+CONFIGURE_ENV+=	install_user=`${ID} -u` \
+		install_group=`${ID} -g`
+
 .if defined(_BUILDING_PROFTPD_MODULE)
 MODULES=		${_BUILDING_PROFTPD_MODULE}
 .for m in ${MODULES}
@@ -80,7 +83,6 @@ INSTALL_WRKSRC=	${WRKSRC}/modules
 PLIST=		${WRKDIR}/PLIST
 .for m in ${MODULES}
 PLIST_FILES+=	libexec/proftpd/${m}.a \
-		libexec/proftpd/${m}.la \
 		libexec/proftpd/${m}.so
 .endfor
 PLIST_DIRSTRY+=	libexec/proftpd
@@ -97,7 +99,7 @@ PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATEDIR}"
 
 .include <bsd.port.options.mk>
 
-.if defined(USE_OPENSSL)
+.if !defined(_BUILDING_PROFTPD_MODULE)
 CFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
 PROFTPD_LIBS+=	-lssl -lcrypto -L${OPENSSLLIB}
 .endif
@@ -167,7 +169,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
@@ -176,7 +178,7 @@ CONFIGURE_ARGS+=	--disable-pcre
 .if ${PORT_OPTIONS:MMEMCACHE}
 MODULES+=		mod_memcache \
 			mod_tls_memcache
-LIB_DEPENDS+=		memcached:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
 CONFIGURE_ARGS+=	--enable-memcache
 PROFTPD_LIBS+=		-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
 PLIST_SUB+=	MEMCACHE=""
@@ -234,9 +236,9 @@ pre-install:
 .else
 post-install:
 	@cd  ${STAGEDIR}${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf || ${TRUE}
-	@${MKDIR} ${STAGEDIR}${LOCALSTATEDIR}/proftpd
-	@cd  ${STAGEDIR}${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem || ${TRUE}
-	@cd  ${STAGEIDR}${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat || ${TRUE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/proftpd ${STAGEDIR}/var/run/proftpd
+	@cd ${STAGEDIR}${PREFIX}/etc/proftpd && ${CP} -n dhparams.pem.sample dhparams.pem || ${TRUE}
+	@cd ${STAGEDIR}${PREFIX}/etc/proftpd && ${CP} -n blacklist.dat.sample blacklist.dat || ${TRUE}
 .if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${STAGEDIR}${DOCSDIR}
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 44cde006ab1c..94f35dffa3ad 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -4,4 +4,3 @@ SHA256 (mod_clamav-v0.13.tar.gz) = 7f60bebbb58836319bf249be77540efc6667a55caca8a
 SIZE (mod_clamav-v0.13.tar.gz) = 11683
 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
 SIZE (mod_sql_tds-4.13.tar.gz) = 11688
-
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index 2e0658e2cd3a..82fb190bee72 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -6,6 +6,7 @@ bin/ftpquota
 bin/ftptop
 bin/ftpwho
 bin/prxs
+etc/PROFTPD-MIB.txt
 @unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi
 etc/proftpd.conf.sample
 @exec cp -n %D/%F %B/proftpd.conf
@@ -16,6 +17,7 @@ etc/proftpd/dhparams.pem.sample
 etc/proftpd/blacklist.dat.sample
 @exec cp -n %D/%F %B/blacklist.dat
 @exec mkdir -p %%LOCALSTATEDIR%%/proftpd
+include/proftpd/ascii.h
 include/proftpd/auth.h
 include/proftpd/bindings.h
 include/proftpd/buildstamp.h
@@ -45,12 +47,15 @@ include/proftpd/libsupp.h
 include/proftpd/log.h
 include/proftpd/memcache.h
 include/proftpd/mkhome.h
-include/proftpd/mod_wrap2.h
+include/proftpd/mod_ctrls.h
+include/proftpd/mod_dnsbl.h
+include/proftpd/mod_log.h
+include/proftpd/mod_quotatab.h
 include/proftpd/mod_sftp.h
+include/proftpd/mod_snmp.h
 include/proftpd/mod_sql.h
 include/proftpd/mod_tls.h
-include/proftpd/mod_quotatab.h
-include/proftpd/mod_ctrls.h
+include/proftpd/mod_wrap2.h
 include/proftpd/modules.h
 include/proftpd/netacl.h
 include/proftpd/netaddr.h
@@ -65,6 +70,7 @@ include/proftpd/proctitle.h
 include/proftpd/proftpd.h
 include/proftpd/regexp.h
 include/proftpd/response.h
+include/proftpd/rlimit.h
 include/proftpd/scoreboard.h
 include/proftpd/session.h
 include/proftpd/sets.h
@@ -81,100 +87,72 @@ include/proftpd/version.h
 include/proftpd/xferlog.h
 libdata/pkgconfig/proftpd.pc
 libexec/proftpd/mod_ban.a
-libexec/proftpd/mod_ban.la
 libexec/proftpd/mod_ban.so
 libexec/proftpd/mod_copy.a
-libexec/proftpd/mod_copy.la
 libexec/proftpd/mod_copy.so
 libexec/proftpd/mod_ctrls_admin.a
-libexec/proftpd/mod_ctrls_admin.la
 libexec/proftpd/mod_ctrls_admin.so
 libexec/proftpd/mod_deflate.a
-libexec/proftpd/mod_deflate.la
 libexec/proftpd/mod_deflate.so
+libexec/proftpd/mod_dnsbl.a
+libexec/proftpd/mod_dnsbl.so
 libexec/proftpd/mod_dynmasq.a
-libexec/proftpd/mod_dynmasq.la
 libexec/proftpd/mod_dynmasq.so
 libexec/proftpd/mod_exec.a
-libexec/proftpd/mod_exec.la
 libexec/proftpd/mod_exec.so
 libexec/proftpd/mod_ifversion.a
-libexec/proftpd/mod_ifversion.la
 libexec/proftpd/mod_ifversion.so
 libexec/proftpd/mod_ifsession.a
-libexec/proftpd/mod_ifsession.la
 libexec/proftpd/mod_ifsession.so
 %%MEMCACHE%%libexec/proftpd/mod_memcache.a
-%%MEMCACHE%%libexec/proftpd/mod_memcache.la
 %%MEMCACHE%%libexec/proftpd/mod_memcache.so
 libexec/proftpd/mod_qos.a
-libexec/proftpd/mod_qos.la
 libexec/proftpd/mod_qos.so
 libexec/proftpd/mod_quotatab.a
-libexec/proftpd/mod_quotatab.la
 libexec/proftpd/mod_quotatab.so
 libexec/proftpd/mod_quotatab_file.a
-libexec/proftpd/mod_quotatab_file.la
 libexec/proftpd/mod_quotatab_file.so
 libexec/proftpd/mod_quotatab_sql.a
-libexec/proftpd/mod_quotatab_sql.la
 libexec/proftpd/mod_quotatab_sql.so
 libexec/proftpd/mod_quotatab_radius.a
-libexec/proftpd/mod_quotatab_radius.la
 libexec/proftpd/mod_quotatab_radius.so
 libexec/proftpd/mod_radius.a
-libexec/proftpd/mod_radius.la
 libexec/proftpd/mod_radius.so
 libexec/proftpd/mod_ratio.a
-libexec/proftpd/mod_ratio.la
 libexec/proftpd/mod_ratio.so
 libexec/proftpd/mod_readme.a
-libexec/proftpd/mod_readme.la
 libexec/proftpd/mod_readme.so
 libexec/proftpd/mod_rewrite.a
-libexec/proftpd/mod_rewrite.la
 libexec/proftpd/mod_rewrite.so
 libexec/proftpd/mod_shaper.a
-libexec/proftpd/mod_shaper.la
 libexec/proftpd/mod_shaper.so
 libexec/proftpd/mod_sftp.a
-libexec/proftpd/mod_sftp.la
 libexec/proftpd/mod_sftp.so
 libexec/proftpd/mod_sftp_pam.a
-libexec/proftpd/mod_sftp_pam.la
 libexec/proftpd/mod_sftp_pam.so
 libexec/proftpd/mod_sftp_sql.a
-libexec/proftpd/mod_sftp_sql.la
 libexec/proftpd/mod_sftp_sql.so
 libexec/proftpd/mod_site_misc.a
-libexec/proftpd/mod_site_misc.la
 libexec/proftpd/mod_site_misc.so
+libexec/proftpd/mod_snmp.a
+libexec/proftpd/mod_snmp.so
 libexec/proftpd/mod_sql.a
-libexec/proftpd/mod_sql.la
 libexec/proftpd/mod_sql.so
 libexec/proftpd/mod_sql_passwd.a
-libexec/proftpd/mod_sql_passwd.la
 libexec/proftpd/mod_sql_passwd.so
 libexec/proftpd/mod_tls.a
-libexec/proftpd/mod_tls.la
 libexec/proftpd/mod_tls.so
 %%MEMCACHE%%libexec/proftpd/mod_tls_memcache.a
-%%MEMCACHE%%libexec/proftpd/mod_tls_memcache.la
 %%MEMCACHE%%libexec/proftpd/mod_tls_memcache.so
 libexec/proftpd/mod_tls_shmcache.a
-libexec/proftpd/mod_tls_shmcache.la
 libexec/proftpd/mod_tls_shmcache.so
 libexec/proftpd/mod_unique_id.a
-libexec/proftpd/mod_unique_id.la
 libexec/proftpd/mod_unique_id.so
 libexec/proftpd/mod_wrap2.a
-libexec/proftpd/mod_wrap2.la
 libexec/proftpd/mod_wrap2.so
 libexec/proftpd/mod_wrap2_file.a
-libexec/proftpd/mod_wrap2_file.la
 libexec/proftpd/mod_wrap2_file.so
 libexec/proftpd/mod_wrap2_sql.a
-libexec/proftpd/mod_wrap2_sql.la
 libexec/proftpd/mod_wrap2_sql.so
 man/man1/ftpcount.1.gz
 man/man1/ftpmail.1.gz
@@ -182,6 +160,7 @@ man/man1/ftpasswd.1.gz
 man/man1/ftpquota.1.gz
 man/man1/ftpwho.1.gz
 man/man1/ftptop.1.gz
+man/man5/proftpd.conf.5.gz
 man/man5/xferlog.5.gz
 man/man8/proftpd.8.gz
 man/man8/ftpscrub.8.gz
@@ -201,15 +180,12 @@ sbin/proftpd
 %%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/bg_BG/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/zh_TW
 %%NLS%%@dirrmtry share/locale/en_US
 %%NLS%%@dirrmtry share/locale/ja_JP
 %%NLS%%@dirrmtry share/locale/it_IT