diff options
| -rw-r--r-- | net-im/jabberd/Makefile | 25 | ||||
| -rw-r--r-- | net-im/jabberd/distinfo | 4 | ||||
| -rw-r--r-- | net-im/jabberd/pkg-plist | 1 | ||||
| -rw-r--r-- | net/jabberd/Makefile | 25 | ||||
| -rw-r--r-- | net/jabberd/distinfo | 4 | ||||
| -rw-r--r-- | net/jabberd/pkg-plist | 1 |
6 files changed, 30 insertions, 30 deletions
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 505d697e997d..e1345bbfb0f9 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= jabberd -PORTVERSION= 2.0.8 +PORTVERSION= 2.0.9 CATEGORIES= net MASTER_SITES= http://files.jabberstudio.org/jabberd2/ DISTNAME= ${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E} @@ -17,6 +17,13 @@ COMMENT= Online presence and instant messaging server LIB_DEPENDS= idn.16:${PORTSDIR}/devel/libidn +OPTIONS= POSTGRESQL "Use PostgreSQL for storage and authentication" off \ + MYSQL "Use MySQL for storage and authentication" off \ + LDAP "Use LDAP for authentication" off \ + BDB "Use BDB for storage and authentication" off \ + PAM "Use PAM for authentication" off \ + DEBUG "Compile with debug information" on + GNU_CONFIGURE= yes USE_OPENSSL= yes USE_ICONV= yes @@ -27,7 +34,9 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-extra-library-path=${LOCALBASE}/lib${ELP} \ --enable-fs -.if !defined(WITHOUT_DEBUG) +.include <bsd.port.pre.mk> + +.if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif @@ -71,16 +80,6 @@ CONFIGURE_ARGS+=--disable-pam MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8 -pre-everything:: - @${ECHO} - @${ECHO} "You can build Jabber with the following options:" - @${ECHO} "WITH_POSTGRESQL use PostgreSQL for storage and authentication" - @${ECHO} "WITH_BDB use Berkeley DB for storage and authentication" - @${ECHO} "WITH_MYSQL use MySQL for storage and authentication" - @${ECHO} "WITH_LDAP use LDAP for authentication" - @${ECHO} "WITH_PAM use PAM for authentication" - @${ECHO} - pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -92,4 +91,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR} @${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo index 545ace704c9e..bb3340033a1b 100644 --- a/net-im/jabberd/distinfo +++ b/net-im/jabberd/distinfo @@ -1,2 +1,2 @@ -MD5 (jabber/jabberd-2.0s8.tar.gz) = 96753c5e74676ace0841a4cee9f13fdb -SIZE (jabber/jabberd-2.0s8.tar.gz) = 757149 +MD5 (jabber/jabberd-2.0s9.tar.gz) = 64905ccbbe5c6fe1f583401802a3e303 +SIZE (jabber/jabberd-2.0s9.tar.gz) = 769049 diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist index 09318e987800..1deafcfe4e18 100644 --- a/net-im/jabberd/pkg-plist +++ b/net-im/jabberd/pkg-plist @@ -1,3 +1,4 @@ +@unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd.sh stop || true bin/c2s bin/jabberd bin/resolver diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile index 505d697e997d..e1345bbfb0f9 100644 --- a/net/jabberd/Makefile +++ b/net/jabberd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= jabberd -PORTVERSION= 2.0.8 +PORTVERSION= 2.0.9 CATEGORIES= net MASTER_SITES= http://files.jabberstudio.org/jabberd2/ DISTNAME= ${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E} @@ -17,6 +17,13 @@ COMMENT= Online presence and instant messaging server LIB_DEPENDS= idn.16:${PORTSDIR}/devel/libidn +OPTIONS= POSTGRESQL "Use PostgreSQL for storage and authentication" off \ + MYSQL "Use MySQL for storage and authentication" off \ + LDAP "Use LDAP for authentication" off \ + BDB "Use BDB for storage and authentication" off \ + PAM "Use PAM for authentication" off \ + DEBUG "Compile with debug information" on + GNU_CONFIGURE= yes USE_OPENSSL= yes USE_ICONV= yes @@ -27,7 +34,9 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-extra-library-path=${LOCALBASE}/lib${ELP} \ --enable-fs -.if !defined(WITHOUT_DEBUG) +.include <bsd.port.pre.mk> + +.if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif @@ -71,16 +80,6 @@ CONFIGURE_ARGS+=--disable-pam MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8 -pre-everything:: - @${ECHO} - @${ECHO} "You can build Jabber with the following options:" - @${ECHO} "WITH_POSTGRESQL use PostgreSQL for storage and authentication" - @${ECHO} "WITH_BDB use Berkeley DB for storage and authentication" - @${ECHO} "WITH_MYSQL use MySQL for storage and authentication" - @${ECHO} "WITH_LDAP use LDAP for authentication" - @${ECHO} "WITH_PAM use PAM for authentication" - @${ECHO} - pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -92,4 +91,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR} @${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/jabberd/distinfo b/net/jabberd/distinfo index 545ace704c9e..bb3340033a1b 100644 --- a/net/jabberd/distinfo +++ b/net/jabberd/distinfo @@ -1,2 +1,2 @@ -MD5 (jabber/jabberd-2.0s8.tar.gz) = 96753c5e74676ace0841a4cee9f13fdb -SIZE (jabber/jabberd-2.0s8.tar.gz) = 757149 +MD5 (jabber/jabberd-2.0s9.tar.gz) = 64905ccbbe5c6fe1f583401802a3e303 +SIZE (jabber/jabberd-2.0s9.tar.gz) = 769049 diff --git a/net/jabberd/pkg-plist b/net/jabberd/pkg-plist index 09318e987800..1deafcfe4e18 100644 --- a/net/jabberd/pkg-plist +++ b/net/jabberd/pkg-plist @@ -1,3 +1,4 @@ +@unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd.sh stop || true bin/c2s bin/jabberd bin/resolver |