From owner-svn-ports-head@FreeBSD.ORG Tue May 20 19:42:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22E28DC8; Tue, 20 May 2014 19:42:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E1242A0C; Tue, 20 May 2014 19:42:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KJgWwF052233; Tue, 20 May 2014 19:42:32 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KJgWgD052230; Tue, 20 May 2014 19:42:32 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201405201942.s4KJgWgD052230@svn.freebsd.org> From: Martin Matuska Date: Tue, 20 May 2014 19:42:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354675 - head/ftp/proftpd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 19:42:33 -0000 Author: mm Date: Tue May 20 19:42:32 2014 New Revision: 354675 URL: http://svnweb.freebsd.org/changeset/ports/354675 QAT: https://qat.redports.org/buildarchive/r354675/ Log: Make portlint happier Fix plist Fix build as non-root Modified: head/ftp/proftpd/Makefile head/ftp/proftpd/distinfo head/ftp/proftpd/pkg-plist Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Tue May 20 19:41:32 2014 (r354674) +++ head/ftp/proftpd/Makefile Tue May 20 19:42:32 2014 (r354675) @@ -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=${LOCALST --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="${LOCALSTATED .include -.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} Modified: head/ftp/proftpd/distinfo ============================================================================== --- head/ftp/proftpd/distinfo Tue May 20 19:41:32 2014 (r354674) +++ head/ftp/proftpd/distinfo Tue May 20 19:42:32 2014 (r354675) @@ -4,4 +4,3 @@ SHA256 (mod_clamav-v0.13.tar.gz) = 7f60b 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 - Modified: head/ftp/proftpd/pkg-plist ============================================================================== --- head/ftp/proftpd/pkg-plist Tue May 20 19:41:32 2014 (r354674) +++ head/ftp/proftpd/pkg-plist Tue May 20 19:42:32 2014 (r354675) @@ -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