diff options
-rw-r--r-- | www/kannel/Makefile | 10 | ||||
-rw-r--r-- | www/kannel/distinfo | 2 | ||||
-rw-r--r-- | www/kannel/files/patch-aa | 42 | ||||
-rw-r--r-- | www/kannel/files/patch-ac | 29 | ||||
-rw-r--r-- | www/kannel/files/patch-ad | 20 | ||||
-rw-r--r-- | www/kannel/files/patch-ae | 9 | ||||
-rw-r--r-- | www/kannel/files/patch-ag | 38 |
7 files changed, 63 insertions, 87 deletions
diff --git a/www/kannel/Makefile b/www/kannel/Makefile index dbaf0010ec17..8c0ac6698922 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -5,18 +5,18 @@ # $FreeBSD$ PORTNAME= kannel -PORTVERSION= 0.10.2 +PORTVERSION= 1.0 CATEGORIES= www MASTER_SITES= http://www.kannel.org/download/${PORTVERSION}/ DISTNAME= gateway-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= martti.kuparinen@iki.fi -LIB_DEPENDS= xml:${PORTSDIR}/textproc/libxml +LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 -GNU_CONFIGURE= yes +USE_AUTOCONF= yes USE_GMAKE= yes -WRKSRC= ${WRKDIR}/gateway-0.10.2/ +WRKSRC= ${WRKDIR}/gateway-${PORTVERSION}/ CFLAGS+= -pthread CONFIGURE_ARGS+= --with-malloc=native diff --git a/www/kannel/distinfo b/www/kannel/distinfo index 7facda88a864..50a5f9b1fb02 100644 --- a/www/kannel/distinfo +++ b/www/kannel/distinfo @@ -1 +1 @@ -MD5 (gateway-0.10.2.tar.gz) = cf1e44ba9af61755240273b5c5510e51 +MD5 (gateway-1.0.tar.gz) = 99fcfd2524db9df938ac7442dcb0b66b diff --git a/www/kannel/files/patch-aa b/www/kannel/files/patch-aa index 28c9f537a62a..0f267d52d2c5 100644 --- a/www/kannel/files/patch-aa +++ b/www/kannel/files/patch-aa @@ -1,21 +1,31 @@ ---- configure.old Wed Jul 19 02:40:15 2000 -+++ configure Wed Jul 19 02:41:42 2000 -@@ -542,7 +542,7 @@ - - +--- configure.in.orig Thu Dec 7 20:44:33 2000 ++++ configure.in Wed Jan 3 20:16:19 2001 +@@ -15,7 +15,7 @@ + dnl Target installation directory for documentation + AC_SUBST(docdir) -docdir='${prefix}/doc/kannel' +docdir='${prefix}/share/doc/kannel' + dnl Checks for programs. + +@@ -26,10 +26,6 @@ + AC_PROG_LEX + AC_PATH_PROG(PERL, perl) + +-AC_CHECK_FILE(/sbin/start-stop-daemon, , +- STARTSTOPDAEMONSRC="utils/start-stop-daemon.c") +-AC_SUBST(STARTSTOPDAEMONSRC) +- + dnl Checks for libraries. + + AC_CHECK_LIB(m, log) +@@ -41,7 +37,7 @@ + fi - # Extract the first word of "gcc", so it can be a program name with args. -@@ -1380,6 +1380,9 @@ - EOF - ;; - *1.8.7) ;; -+ *1.8.8) ;; -+ *1.8.9) ;; -+ *1.8.??) ;; - *2.0.0) ;; - *) echo "Libxml is too old. You need at least 1.8.6." ; exit 1 ;; - esac + AC_CHECK_LIB(z, gzopen) +-AC_PATH_PROG(XML_CONFIG, xml-config, no) ++AC_PATH_PROG(XML_CONFIG, xml2-config, no) + if test "$XML_CONFIG" = "no"; then + echo "You MUST have the gnome-xml library installed"; exit 1 + else diff --git a/www/kannel/files/patch-ac b/www/kannel/files/patch-ac index 7d3ec971bfd8..ffb2d4ee827e 100644 --- a/www/kannel/files/patch-ac +++ b/www/kannel/files/patch-ac @@ -1,15 +1,24 @@ ---- Makefile.in.old Wed Jul 19 02:58:15 2000 -+++ Makefile.in Wed Jul 19 02:58:29 2000 -@@ -90,7 +90,7 @@ +--- Makefile.in.orig Thu Sep 14 17:35:51 2000 ++++ Makefile.in Wed Jan 3 20:19:31 2001 +@@ -87,7 +87,7 @@ # Set this to something if you want all installed binaries to have a suffix. - # Version number if common. + # Version number is common. -suffix = -$(VERSION) +# suffix = -$(VERSION) # # You probably don't need to touch anything below this, if you're just -@@ -135,6 +135,8 @@ +@@ -104,7 +104,7 @@ + wmlscript/wmlsdasm.c \ + utils/seewbmp.c \ + utils/run_kannel_box.c \ +- $(STARTSTOPDAEMONSRC) ++ + progobjs = $(progsrcs:.c=.o) + progs = $(progsrcs:.c=) + +@@ -137,6 +137,8 @@ docs = $(docsrcs:.xml=.html) $(docsrcs:.xml=.ps) DOCSTARGET=@DOCSTARGET@ @@ -18,9 +27,9 @@ figsrcs = $(shell echo doc/*/*.fig) figs = $(figsrcs:.fig=.png) $(figsrcs:.fig=.ps) -@@ -177,7 +179,9 @@ - no-docs: - figs: $(figs) +@@ -182,7 +184,9 @@ + check: all + utils/run-checks $(checks) -install: all +install: install-main install-docs @@ -29,7 +38,7 @@ $(INSTALL) -d $(bindir) for prog in $(progs); do \ $(INSTALL) $$prog $(bindir)/`basename $$prog`$(suffix); \ -@@ -185,7 +189,7 @@ +@@ -190,7 +194,7 @@ install-docs: $(INSTALL) -d $(docdir) @@ -37,4 +46,4 @@ + cp -r $(alldocs) $(docdir) clean: - rm -f core $(progs) $(testprogs) $(objs) $(docs) *.a + rm -f core $(progs) $(testprogs) $(checkprogs) $(objs) $(docs) *.a diff --git a/www/kannel/files/patch-ad b/www/kannel/files/patch-ad index 54304c0c4f09..64a8964b3d90 100644 --- a/www/kannel/files/patch-ad +++ b/www/kannel/files/patch-ad @@ -1,11 +1,15 @@ ---- debian/kannel.conf.old Wed Jul 19 03:27:31 2000 -+++ debian/kannel.conf Wed Jul 19 03:27:49 2000 -@@ -13,7 +13,7 @@ - heartbeat-freq = 30 - allowed-hosts = "127.0.0.1" - denied-hosts = "*.*.*.*" +--- debian/kannel.conf.orig Mon Dec 11 14:00:30 2000 ++++ debian/kannel.conf Wed Jan 3 20:11:13 2001 +@@ -13,10 +13,10 @@ + admin-allow-ip = "127.0.0.1" + wapbox-port = 13002 + wdp-interface-name = "*" -log-file = "/var/log/kannel/bearerbox.log" +log-file = "/var/log/bearerbox.log" - log-level = 0 + box-deny-ip = "*.*.*.*" + box-allow-ip = "127.0.0.1" - # A fake SMSC just for testing purposes. Uncomment if you use it. + group = wapbox + bearerbox-host = localhost +-log-file = "/var/log/kannel/wapbox.log" ++log-file = "/var/log/wapbox.log" diff --git a/www/kannel/files/patch-ae b/www/kannel/files/patch-ae deleted file mode 100644 index ab959538b299..000000000000 --- a/www/kannel/files/patch-ae +++ /dev/null @@ -1,9 +0,0 @@ ---- debian/kannel.wapconf.old Wed Jul 19 03:28:43 2000 -+++ debian/kannel.wapconf Wed Jul 19 03:28:55 2000 -@@ -6,5 +6,5 @@ - bearerbox-host = localhost - bearerbox-port = 13002 - heartbeat-freq = 30 --log-file = "/var/log/kannel/wapbox.log" -+log-file = "/var/log/wapbox.log" - log-level = 0 diff --git a/www/kannel/files/patch-ag b/www/kannel/files/patch-ag deleted file mode 100644 index a53b1132b586..000000000000 --- a/www/kannel/files/patch-ag +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.old Mon Jul 24 19:52:35 2000 -+++ configure Mon Jul 24 19:52:57 2000 -@@ -1028,35 +1028,6 @@ - echo "$ac_t""no" 1>&6 - fi - -- -- --ac_safe=`echo "/sbin/start-stop-daemon" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for /sbin/start-stop-daemon""... $ac_c" 1>&6 --echo "configure:1036: checking for /sbin/start-stop-daemon" >&5 --if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test "$cross_compiling" = yes; then -- { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } --else -- if test -r /sbin/start-stop-daemon; then -- eval "ac_cv_file_$ac_safe=yes" -- else -- eval "ac_cv_file_$ac_safe=no" -- fi --fi --fi --if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 --STARTSTOPDAEMONSRC="utils/start-stop-daemon.c" --fi -- -- -- -- - echo $ac_n "checking for log in -lm""... $ac_c" 1>&6 - echo "configure:1062: checking for log in -lm" >&5 - ac_lib_var=`echo m'_'log | sed 'y%./+-%__p_%'` |