Date: Wed, 9 Jul 2014 15:20:21 +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: r361381 - in head/net-im/jabber: . files Message-ID: <201407091520.s69FKLND053513@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Jul 9 15:20:20 2014 New Revision: 361381 URL: http://svnweb.freebsd.org/changeset/ports/361381 QAT: https://qat.redports.org/buildarchive/r361381/ Log: - Convert to USES=libtool - Add INSTALL_TARGET=install-strip - Use USERS and GROUPS instead of pkg-install - Use @sample Modified: head/net-im/jabber/Makefile head/net-im/jabber/files/pkg-deinstall.in head/net-im/jabber/files/pkg-install.in head/net-im/jabber/pkg-plist Modified: head/net-im/jabber/Makefile ============================================================================== --- head/net-im/jabber/Makefile Wed Jul 9 15:20:14 2014 (r361380) +++ head/net-im/jabber/Makefile Wed Jul 9 15:20:20 2014 (r361381) @@ -3,7 +3,7 @@ PORTNAME= jabber PORTVERSION= 1.6.1.1 -PORTREVISION= 14 +PORTREVISION= 15 PORTEPOCH= 1 CATEGORIES= net-im ipv6 MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/ @@ -24,9 +24,10 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/deve OPTIONS_DEFINE= IPV6 MYSQL PGSQL +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= gettext gmake iconv libtool pkgconfig USE_RC_SUBR= jabber -USES= gettext gmake iconv pkgconfig -USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ --includedir=${PREFIX}/include/jabber \ @@ -40,17 +41,18 @@ LDFLAGS+= $$(pth-config --ldflags) \ -L${LOCALBASE}/lib SUB_FILES= pkg-install pkg-deinstall pkg-message -SUB_LIST= JABBER_USER=${JABBER_USER} JABBER_UID=${JABBER_UID} \ - JABBER_GROUP=${JABBER_GROUP} JABBER_GID=${JABBER_GID} \ +SUB_LIST= JABBER_USER=${JABBER_USER} \ + JABBER_GROUP=${JABBER_GROUP} \ JABBER_ETCDIR="${JABBER_ETCDIR}" \ JABBER_LOGDIR="${JABBER_LOGDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" +USERS= ${JABBER_USER} +GROUPS= ${JABBER_GROUP} + JABBER_USER= jabber -JABBER_UID= 93 -JABBER_GROUP= ${JABBER_USER} -JABBER_GID= ${JABBER_UID} +JABBER_GROUP= jabber JABBER_ETCDIR= "${PREFIX}/etc" JABBER_RUNDIR= "/var/run/jabberd" JABBER_SPOOLDIR="/var/spool/jabberd" Modified: head/net-im/jabber/files/pkg-deinstall.in ============================================================================== --- head/net-im/jabber/files/pkg-deinstall.in Wed Jul 9 15:20:14 2014 (r361380) +++ head/net-im/jabber/files/pkg-deinstall.in Wed Jul 9 15:20:20 2014 (r361381) @@ -4,22 +4,13 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -USER=%%JABBER_USER%% -GROUP=%%JABBER_GROUP%% RUNDIR="%%JABBER_RUNDIR%%" SPOOLDIR="%%JABBER_SPOOLDIR%%" LOGDIR="%%LOGDIR%%" -if pw usershow "${USER}" 2>/dev/null 1>&2; then - echo "To delete Jabber user permanently, use 'pw userdel ${USER}'" -fi - -if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'" -fi - echo "You may want to delete the following directories:" echo "${RUNDIR}" echo "${SPOOLDIR}" +echo "${LOGDIR}" exit 0 Modified: head/net-im/jabber/files/pkg-install.in ============================================================================== --- head/net-im/jabber/files/pkg-install.in Wed Jul 9 15:20:14 2014 (r361380) +++ head/net-im/jabber/files/pkg-install.in Wed Jul 9 15:20:20 2014 (r361381) @@ -6,34 +6,10 @@ fi USER=%%JABBER_USER%% GROUP=%%JABBER_GROUP%% -UID=%%JABBER_UID%% -GID=%%JABBER_GID%% -ETCDIR=%%JABBER_ETCDIR%% RUNDIR=%%JABBER_RUNDIR%% SPOOLDIR=%%JABBER_SPOOLDIR%% LOGDIR=%%JABBER_LOGDIR%% -if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if ! pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s "/sbin/nologin" -d "/nonexistent" \ - -c "Jabber Daemon"; \ - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -fi - if [ ! -d ${RUNDIR} ]; then echo "Creating \"${RUNDIR}\"." mkdir -p ${RUNDIR} @@ -48,11 +24,6 @@ if [ ! -d ${SPOOLDIR} ]; then mkdir -p ${SPOOLDIR} fi -if [ ! -d ${SPOOLDIR} ]; then - echo "Creating \"${SPOOLDIR}\"." - mkdir -p ${SPOOLDIR} -fi - if [ ! -d ${LOGDIR} ]; then echo "Creating \"${LOGDIR}\"." mkdir -p ${LOGDIR} Modified: head/net-im/jabber/pkg-plist ============================================================================== --- head/net-im/jabber/pkg-plist Wed Jul 9 15:20:14 2014 (r361380) +++ head/net-im/jabber/pkg-plist Wed Jul 9 15:20:20 2014 (r361381) @@ -1,37 +1,29 @@ bin/jabberd14 bin/xdbfiletool -etc/jabber.xml.sample +@sample etc/jabber.xml.sample include/jabber/jabberd.h include/jabber/jabberdlib.h include/jabber/platform-settings -lib/jabber/libjabberd.a -lib/jabber/libjabberd.la lib/jabber/libjabberd.so lib/jabber/libjabberd.so.2 -lib/jabber/libjabberddialback.a -lib/jabber/libjabberddialback.la +lib/jabber/libjabberd.so.2.0.0 lib/jabber/libjabberddialback.so -lib/jabber/libjabberddialback.so.2 -lib/jabber/libjabberddnsrv.a -lib/jabber/libjabberddnsrv.la +lib/jabber/libjabberddialback.so.2.0.0 lib/jabber/libjabberddnsrv.so lib/jabber/libjabberddnsrv.so.2 -lib/jabber/libjabberdpthsock.a -lib/jabber/libjabberdpthsock.la +lib/jabber/libjabberddnsrv.so.2.0.0 lib/jabber/libjabberdpthsock.so lib/jabber/libjabberdpthsock.so.2 -lib/jabber/libjabberdsm.a -lib/jabber/libjabberdsm.la +lib/jabber/libjabberdpthsock.so.2.0.0 lib/jabber/libjabberdsm.so lib/jabber/libjabberdsm.so.2 -lib/jabber/libjabberdxdbfile.a -lib/jabber/libjabberdxdbfile.la +lib/jabber/libjabberdsm.so.2.0.0 lib/jabber/libjabberdxdbfile.so lib/jabber/libjabberdxdbfile.so.2 -lib/jabber/libjabberdxdbsql.a -lib/jabber/libjabberdxdbsql.la +lib/jabber/libjabberdxdbfile.so.2.0.0 lib/jabber/libjabberdxdbsql.so lib/jabber/libjabberdxdbsql.so.2 +lib/jabber/libjabberdxdbsql.so.2.0.0 man/man5/jabber.xml.5.gz man/man8/jabberd14.8.gz share/locale/de/LC_MESSAGES/jabberd14.mo @@ -53,6 +45,5 @@ share/locale/nl/LC_MESSAGES/jabberd14.mo %%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%PORTDOCS%%%%DOCSDIR%%/mysql.sql %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry /var/spool/jabberd @dirrmtry lib/jabber @dirrmtry include/jabber
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407091520.s69FKLND053513>