Date: Wed, 9 Jul 2014 14:15:20 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361371 - head/net-im/jabberd Message-ID: <201407091415.s69EFKwL020997@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Jul 9 14:15:20 2014 New Revision: 361371 URL: http://svnweb.freebsd.org/changeset/ports/361371 QAT: https://qat.redports.org/buildarchive/r361371/ Log: - Add USES=libtool and INSTALL_TARGET=install-strip - Remove references to PTHREAD_CFLAGS and PTHREAD_LIBS Modified: head/net-im/jabberd/Makefile head/net-im/jabberd/pkg-plist Modified: head/net-im/jabberd/Makefile ============================================================================== --- head/net-im/jabberd/Makefile Wed Jul 9 14:14:13 2014 (r361370) +++ head/net-im/jabberd/Makefile Wed Jul 9 14:15:20 2014 (r361371) @@ -3,7 +3,7 @@ PORTNAME= jabberd DISTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ LOCAL/matthew/${PORTNAME} @@ -25,12 +25,13 @@ OPTIONS_DEFAULT=MYSQL DEBUG GSASL OPTIONS_SUB= yes GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= compiler:c11 iconv libtool perl5 tar:xz USE_PERL5= run USE_OPENSSL= yes -USES= iconv perl5 compiler:c11 tar:xz USE_RC_SUBR= jabberd USE_LDCONFIG= ${PREFIX}/lib/jabberd -CONFIGURE_ARGS+= --localstatedir=/var \ +CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${PREFIX}/etc/jabberd \ --enable-ssl --enable-mio=poll \ --disable-tests \ @@ -71,7 +72,6 @@ PGSQL_CONFIGURE_ENABLE= pgsql SQLITE_CONFIGURE_ENABLE=sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 -SQLITE_CFLAGS= ${PTHREAD_CFLAGS} MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql @@ -141,8 +141,6 @@ SUB_LIST+= REQUIRE="LOGIN" REQUIRES_DESC= Add backend requires to startup script post-patch: - @${REINPLACE_CMD} -e 's|"-lsqlite3|"-lsqlite3 ${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \ ${WRKSRC}/tools/jabberd.in .if ${PORT_OPTIONS:MCYRUS} Modified: head/net-im/jabberd/pkg-plist ============================================================================== --- head/net-im/jabberd/pkg-plist Wed Jul 9 14:14:13 2014 (r361370) +++ head/net-im/jabberd/pkg-plist Wed Jul 9 14:15:20 2014 (r361371) @@ -20,110 +20,95 @@ etc/jabberd/s2s.xml.dist etc/jabberd/sm.xml.dist @unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi etc/jabberd/templates/roster.xml.dist -%%ANON%%lib/jabberd/authreg_anon.la %%ANON%%lib/jabberd/authreg_anon.so -%%BDB%%lib/jabberd/authreg_db.la %%BDB%%lib/jabberd/authreg_db.so -%%LDAP%%lib/jabberd/authreg_ldap.la %%LDAP%%lib/jabberd/authreg_ldap.so -%%LDAP%%lib/jabberd/authreg_ldapfull.la %%LDAP%%lib/jabberd/authreg_ldapfull.so -%%MYSQL%%lib/jabberd/authreg_mysql.la %%MYSQL%%lib/jabberd/authreg_mysql.so -%%PAM%%lib/jabberd/authreg_pam.la %%PAM%%lib/jabberd/authreg_pam.so -%%PIPE%%lib/jabberd/authreg_pipe.la %%PIPE%%lib/jabberd/authreg_pipe.so -%%PGSQL%%lib/jabberd/authreg_pgsql.la %%PGSQL%%lib/jabberd/authreg_pgsql.so -%%SQLITE%%lib/jabberd/authreg_sqlite.la %%SQLITE%%lib/jabberd/authreg_sqlite.so -lib/jabberd/libstorage.la lib/jabberd/libstorage.so lib/jabberd/libstorage.so.0 -lib/jabberd/mod_active.la +lib/jabberd/libstorage.so.0.0.0 lib/jabberd/mod_active.so lib/jabberd/mod_active.so.0 -lib/jabberd/mod_amp.la +lib/jabberd/mod_active.so.0.0.0 lib/jabberd/mod_amp.so lib/jabberd/mod_amp.so.0 -lib/jabberd/mod_announce.la +lib/jabberd/mod_amp.so.0.0.0 lib/jabberd/mod_announce.so lib/jabberd/mod_announce.so.0 -lib/jabberd/mod_deliver.la +lib/jabberd/mod_announce.so.0.0.0 lib/jabberd/mod_deliver.so lib/jabberd/mod_deliver.so.0 -lib/jabberd/mod_disco.la +lib/jabberd/mod_deliver.so.0.0.0 lib/jabberd/mod_disco.so lib/jabberd/mod_disco.so.0 -lib/jabberd/mod_echo.la +lib/jabberd/mod_disco.so.0.0.0 lib/jabberd/mod_echo.so lib/jabberd/mod_echo.so.0 -lib/jabberd/mod_help.la +lib/jabberd/mod_echo.so.0.0.0 lib/jabberd/mod_help.so lib/jabberd/mod_help.so.0 -lib/jabberd/mod_iq-last.la +lib/jabberd/mod_help.so.0.0.0 lib/jabberd/mod_iq-last.so lib/jabberd/mod_iq-last.so.0 -lib/jabberd/mod_iq-ping.la +lib/jabberd/mod_iq-last.so.0.0.0 lib/jabberd/mod_iq-ping.so lib/jabberd/mod_iq-ping.so.0 -lib/jabberd/mod_iq-private.la +lib/jabberd/mod_iq-ping.so.0.0.0 lib/jabberd/mod_iq-private.so lib/jabberd/mod_iq-private.so.0 -lib/jabberd/mod_iq-time.la +lib/jabberd/mod_iq-private.so.0.0.0 lib/jabberd/mod_iq-time.so lib/jabberd/mod_iq-time.so.0 -lib/jabberd/mod_iq-vcard.la +lib/jabberd/mod_iq-time.so.0.0.0 lib/jabberd/mod_iq-vcard.so lib/jabberd/mod_iq-vcard.so.0 -lib/jabberd/mod_iq-version.la +lib/jabberd/mod_iq-vcard.so.0.0.0 lib/jabberd/mod_iq-version.so lib/jabberd/mod_iq-version.so.0 -lib/jabberd/mod_offline.la +lib/jabberd/mod_iq-version.so.0.0.0 lib/jabberd/mod_offline.so lib/jabberd/mod_offline.so.0 -lib/jabberd/mod_pep.la +lib/jabberd/mod_offline.so.0.0.0 lib/jabberd/mod_pep.so lib/jabberd/mod_pep.so.0 -lib/jabberd/mod_presence.la +lib/jabberd/mod_pep.so.0.0.0 lib/jabberd/mod_presence.so lib/jabberd/mod_presence.so.0 -lib/jabberd/mod_privacy.la +lib/jabberd/mod_presence.so.0.0.0 lib/jabberd/mod_privacy.so lib/jabberd/mod_privacy.so.0 -lib/jabberd/mod_roster.la +lib/jabberd/mod_privacy.so.0.0.0 lib/jabberd/mod_roster.so lib/jabberd/mod_roster.so.0 -lib/jabberd/mod_roster-publish.la +lib/jabberd/mod_roster.so.0.0.0 lib/jabberd/mod_roster-publish.so lib/jabberd/mod_roster-publish.so.0 -lib/jabberd/mod_session.la +lib/jabberd/mod_roster-publish.so.0.0.0 lib/jabberd/mod_session.so lib/jabberd/mod_session.so.0 -lib/jabberd/mod_status.la +lib/jabberd/mod_session.so.0.0.0 lib/jabberd/mod_status.so lib/jabberd/mod_status.so.0 -lib/jabberd/mod_template-roster.la +lib/jabberd/mod_status.so.0.0.0 lib/jabberd/mod_template-roster.so lib/jabberd/mod_template-roster.so.0 -lib/jabberd/mod_vacation.la +lib/jabberd/mod_template-roster.so.0.0.0 lib/jabberd/mod_vacation.so lib/jabberd/mod_vacation.so.0 -lib/jabberd/mod_validate.la +lib/jabberd/mod_vacation.so.0.0.0 lib/jabberd/mod_validate.so lib/jabberd/mod_validate.so.0 -%%FS%%lib/jabberd/storage_fs.la +lib/jabberd/mod_validate.so.0.0.0 %%FS%%lib/jabberd/storage_fs.so -%%BDB%%lib/jabberd/storage_db.la %%BDB%%lib/jabberd/storage_db.so -%%LDAP%%lib/jabberd/storage_ldapvcard.la %%LDAP%%lib/jabberd/storage_ldapvcard.so -%%MYSQL%%lib/jabberd/storage_mysql.la %%MYSQL%%lib/jabberd/storage_mysql.so -%%PGSQL%%lib/jabberd/storage_pgsql.la %%PGSQL%%lib/jabberd/storage_pgsql.so -%%SQLITE%%lib/jabberd/storage_sqlite.la %%SQLITE%%lib/jabberd/storage_sqlite.so man/man8/c2s.8.gz man/man8/jabberd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407091415.s69EFKwL020997>