On 2013/04/07 23:41, Roman Kravchuk wrote:
> This is updated port kannel.
> 
> Ok? Comments?

slightly tweaked version attached: diff against your version below.
notably I moved the primary category to telephony/ which I think makes
sense - net/ is fairly huge so I'd like to avoid putting new ports
there if there's a good alternative.

would anyone like to give me an OK to import this?


diff --git a/Makefile b/Makefile
index 4f9559b..e288f48 100644
--- a/Makefile
+++ b/Makefile
@@ -7,24 +7,20 @@ SVNREV =              5035
 DISTNAME =             kannel-${VERSION}pre20130330
 PKGNAME =              kannel-${VERSION}
 
-CATEGORIES =           net
+CATEGORIES =           telephony net
 MAINTAINER =           Roman Kravchuk <kravchuk...@gmail.com>
 
 HOMEPAGE =             http://kannel.org/
 
 # BSD-like with naming restrictions, see http://kannel.org/license.shtml
 PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP =   Yes
-PERMIT_DISTFILES_FTP = Yes
-
-# MASTER_SITES =       https://svn.kannel.org/gateway/trunk
-MASTER_SITES =         http://spacehopper.org/mirrors/
-
-LDFLAGS="${LDFLAGS} -pthread"
 
 WANTLIB =              c crypto m ssl z pthread ssl xml2 iconv \
                        pcre pcreposix
 
+# checkout from https://svn.kannel.org/gateway/trunk
+MASTER_SITES =         http://spacehopper.org/mirrors/
+
 LIB_DEPENDS =          textproc/libxml,-main,no_python \
                        converters/libiconv \
                        devel/pcre
@@ -33,12 +29,13 @@ USE_GMAKE =         Yes
 CONFIGURE_STYLE =      gnu
 CONFIGURE_ARGS +=      --enable-warnings \
                        --enable-pcre
+CONFIGURE_ENV =                LDFLAGS="${LDFLAGS} -pthread"
 
 WRKDIST =              ${WRKDIR}/gateway
 
 NO_TEST =              Yes
 
-FLAVORS =              sqlite3 pgsql mysql
+FLAVORS =              sqlite3 pgsql mysql
 
 FLAVOR ?=
 .if empty(FLAVOR)
@@ -59,7 +56,7 @@ CONFIGURE_ARGS +=     --with-mysql
 WANTLIB +=             mysqlclient lib/mysql/mysqlclient_r
 LIB_DEPENDS +=         databases/mysql,-main
 .else
-ERRORS +=              "Fatal: Conflicting flavors: ${FLAVOR}";
+ERRORS +=              "Fatal: Conflicting flavors: ${FLAVOR}"
 .endif
 
 SH_SCRIPTS = kannelctl smsbox_enable wapbox_enable
@@ -68,9 +65,6 @@ pre-configure:
        @perl -pi -e 's,^svn,svn-r${SVNREV},' ${WRKSRC}/VERSION
 
 post-install:
-.for i in ${SH_SCRIPTS}
-       ${SUBST_CMD} -c ${FILESDIR}/$i ${WRKDIR}/$i
-.endfor
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/kannel
        ${INSTALL_DATA} ${WRKSRC}/doc/examples/kannel.conf \
                ${WRKSRC}/doc/examples/modems.conf \
@@ -78,7 +72,8 @@ post-install:
                ${WRKSRC}/doc/examples/dlr-sqlite3.conf \
                ${PREFIX}/share/examples/kannel
 .for i in ${SH_SCRIPTS}
-       ${INSTALL_SCRIPT} ${WRKDIR}/$i ${PREFIX}/sbin
+       ${SUBST_CMD} -c ${FILESDIR}/$i ${WRKDIR}/$i
+       ${INSTALL_SCRIPT} ${WRKDIR}/$i ${PREFIX}/sbin/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/pkg/PLIST b/pkg/PLIST
index f14d635..4a95665 100644
--- a/pkg/PLIST
+++ b/pkg/PLIST
@@ -1,6 +1,8 @@
 @comment $OpenBSD$
 @newgroup _kannel:712
 @newuser _kannel:712:712:daemon:Kannel:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/log/kannel/*
+@extraunexec rm -rf /var/spool/kannel/
 @bin bin/decode_emimsg
 bin/gw-config
 @bin bin/mtbatch
diff --git a/pkg/kannel.rc b/pkg/kannel.rc
index 670819e..26fe3a4 100644
--- a/pkg/kannel.rc
+++ b/pkg/kannel.rc
@@ -6,6 +6,8 @@ daemon="${TRUEPREFIX}/sbin/bearerbox"
 
 . /etc/rc.d/rc.subr
 
+rc_reload=NO
+
 rc_pre() {
        install -d -o _kannel /var/run/kannel
 }
@@ -18,6 +20,4 @@ rc_stop() {
        ${rcexec} "${TRUEPREFIX}/sbin/kannelctl stop"
 }
 
-rc_reload=NO
-
 rc_cmd $1

Attachment: kannel.tgz
Description: application/tar-gz

Reply via email to