From owner-svn-ports-all@FreeBSD.ORG Sun Feb 9 01:54:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 621C0BCF; Sun, 9 Feb 2014 01:54:22 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3D4E4133D; Sun, 9 Feb 2014 01:54:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s191sMi2018917; Sun, 9 Feb 2014 01:54:22 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s191sL6i018915; Sun, 9 Feb 2014 01:54:21 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201402090154.s191sL6i018915@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 9 Feb 2014 01:54:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343415 - head/ftp/wzdftpd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 01:54:22 -0000 Author: danilo Date: Sun Feb 9 01:54:21 2014 New Revision: 343415 URL: http://svnweb.freebsd.org/changeset/ports/343415 QAT: https://qat.redports.org/buildarchive/r343415/ Log: - Add stage support - Use options helpers Modified: head/ftp/wzdftpd/Makefile head/ftp/wzdftpd/pkg-plist Modified: head/ftp/wzdftpd/Makefile ============================================================================== --- head/ftp/wzdftpd/Makefile Sun Feb 9 01:18:32 2014 (r343414) +++ head/ftp/wzdftpd/Makefile Sun Feb 9 01:54:21 2014 (r343415) @@ -18,6 +18,8 @@ OPTIONS_RADIO_ZEROCONF= AVAHI HOWL OPTIONS_DEFAULT= AVAHI GNUTLS HOWL_DESC= Zeroconf support via Howl +OPTIONS_SUB= yes + USES= pkgconfig USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf LIBTOOLIZE_ARGS=--copy --force @@ -31,77 +33,44 @@ USE_RC_SUBR= wzdftpd CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= siteconfig.1 siteuptime.1 sitewho.1 wzd-config.1 -MAN8= wzdftpd.8 +ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} +ICONV_CONFIGURE_OFF= --disable-utf8 +ICONV_USES= iconv -NO_STAGE= yes -.include +TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR} +TCL_CONFIGURE_OFF= --without-tcl +TCL_USES= tcl -.if ${PORT_OPTIONS:MICONV} -USES+= iconv -CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} -.else -CONFIGURE_ARGS+= --disable-utf8 -.endif +OPENSSL_CONFIGURE_ENABLE= openssl +OPENSSL_USE= OPENSSL=yes -.if ${PORT_OPTIONS:MTCL} -USES+= tcl -CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} -PLIST_SUB+= TCL="" -.else -PLIST_SUB+= TCL="@comment " -.endif +GNUTLS_CONFIGURE_ENABLE= gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -.else -CONFIGURE_ARGS+= --disable-openssl -.endif +IPV6_CONFIGURE_ENABLE= ipv6 -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls -.else -CONFIGURE_ARGS+= --disable-gnutls -.endif +PERL_CONFIGURE_ENABLE= perl +PERL_USES= perl5 -.if empty(PORT_OPTIONS:MIPV6) -CONFIGURE_ARGS+= --disable-ipv6 -.endif +MYSQL_CONFIGURE_ENABLE= mysql +MYSQL_USE= MYSQL=yes -.if ${PORT_OPTIONS:MPERL} -USES+= perl5 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER} -MAN3+= wzdftpd.3 -PLIST_SUB+= PERL="" -.else -CONFIGURE_ARGS+= --disable-perl -PLIST_SUB+= PERL="@comment " -.endif +PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} +PGSQL_CONFIGURE_OFF= --disable-pgsql +PGSQL_USE= PGSQL=yes -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -PLIST_SUB+= MYSQL="" -.else -CONFIGURE_ARGS+= --disable-mysql -PLIST_SUB+= MYSQL="@comment " -.endif +SQLITE_CONFIGURE_ENABLE= sqlite3 +SQLITE_USE= SQLITE=3 -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} -PLIST_SUB+= PGSQL="" -.else -CONFIGURE_ARGS+= --disable-pgsql -PLIST_SUB+= PGSQL="@comment " -.endif +AVAHI_CONFIGURE_ON= --with-zeroconf --enable-avahi +AVAHI_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ + libavahi-core.so:${PORTSDIR}/net/avahi-app -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= 3 -PLIST_SUB+= SQLITE="" -.else -CONFIGURE_ARGS+= --disable-sqlite3 -PLIST_SUB+= SQLITE="@comment " -.endif +HOWL_CONFIGURE_ON= --with-zeroconf --enable-howl +HOWL_CPPFLAGS= -I${LOCALBASE}/include/howl +HOWL_LIB_DEPENDS= libhowl.so:${PORTSDIR}/net/howl + +.include .if ${PORT_OPTIONS:MAVAHI} || ${PORT_OPTIONS:MHOWL} PLIST_SUB+= ZEROCONF="" @@ -109,18 +78,6 @@ PLIST_SUB+= ZEROCONF="" PLIST_SUB+= ZEROCONF="@comment " .endif -.if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus \ - libavahi-core.so:${PORTSDIR}/net/avahi-app -CONFIGURE_ARGS+= --with-zeroconf --enable-avahi -.endif - -.if ${PORT_OPTIONS:MHOWL} -LIB_DEPENDS+= libhowl.so:${PORTSDIR}/net/howl -CPPFLAGS+= -I${LOCALBASE}/include/howl -CONFIGURE_ARGS+= --with-zeroconf --enable-howl -.endif - post-extract: @${RM} -f ${WRKSRC}/m4/libtool.m4 @${RM} -f ${WRKSRC}/m4/lib-*.m4 @@ -147,13 +104,15 @@ post-patch: /gcry_control/d' \ post-install: - (cd ${WRKSRC} && ${INSTALL_DATA} *.pc ${PREFIX}/libdata/pkgconfig ) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MPERL} + @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \ + ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/wzdftpd/.packlist +.endif + (cd ${WRKSRC} && ${INSTALL_DATA} *.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig ) + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog NEWS Permissions.ReadMeFirst README \ TLS.ReadMeFirst UPGRADING wzd_tls.cnf - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include Modified: head/ftp/wzdftpd/pkg-plist ============================================================================== --- head/ftp/wzdftpd/pkg-plist Sun Feb 9 01:18:32 2014 (r343414) +++ head/ftp/wzdftpd/pkg-plist Sun Feb 9 01:54:21 2014 (r343415) @@ -2,6 +2,11 @@ bin/siteconfig bin/siteuptime bin/sitewho bin/wzd-config +man/man1/siteconfig.1.gz +man/man1/siteuptime.1.gz +man/man1/sitewho.1.gz +man/man1/wzd-config.1.gz +man/man8/wzdftpd.8.gz %%ETCDIR%%/file_ginfo.txt %%ETCDIR%%/file_group.txt %%ETCDIR%%/file_groups.txt @@ -114,6 +119,7 @@ lib/wzdftpd/modules/libwzd_debug.so %%PERL%%lib/wzdftpd/modules/libwzd_perl.a %%PERL%%lib/wzdftpd/modules/libwzd_perl.la %%PERL%%lib/wzdftpd/modules/libwzd_perl.so +%%PERL%%lib/perl5/%%PERL_VER%%/man/man3/wzdftpd.3.gz lib/wzdftpd/modules/libwzd_sfv.a lib/wzdftpd/modules/libwzd_sfv.la lib/wzdftpd/modules/libwzd_sfv.so