diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile index fd8fbd829c5..0f21991e6fb 100644 --- a/net/gnugk/Makefile +++ b/net/gnugk/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2008/03/15 17:40:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2008/04/03 07:18:08 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= H.323 gatekeeper -DISTNAME= gnugk-2.2.6 -PKGNAME= ${DISTNAME}p2 +DISTNAME= gnugk-2.2.7 CATEGORIES= net telephony HOMEPAGE= http://www.gnugk.org/ @@ -53,6 +52,7 @@ CONFIGURE_ARGS+=--disable-mysql .if ${FLAVOR:L:Mpgsql} LIB_DEPENDS+= pq.>=5::databases/postgresql CONFIGURE_ARGS+=--enable-pgsql \ + --with-pgsql-lib-dir=${LOCALBASE}/lib \ --with-pgsql-include-dir=${LOCALBASE}/include/postgresql .else CONFIGURE_ARGS+=--disable-pgsql diff --git a/net/gnugk/distinfo b/net/gnugk/distinfo index 5e19acab222..606162bb6a8 100644 --- a/net/gnugk/distinfo +++ b/net/gnugk/distinfo @@ -1,5 +1,5 @@ -MD5 (gnugk-2.2.6.tar.gz) = j0fPpLN13q5lqjuZNHbp5A== -RMD160 (gnugk-2.2.6.tar.gz) = 38xi1/XvK0td1K7DdZej4FUQeSk= -SHA1 (gnugk-2.2.6.tar.gz) = p2rYGUbPLOMcGFV8rrN4tv25ECY= -SHA256 (gnugk-2.2.6.tar.gz) = fMi3fQ8glhyP8wgoU9VYl4S4JrmunLQW9X6WUnPCfOw= -SIZE (gnugk-2.2.6.tar.gz) = 1127169 +MD5 (gnugk-2.2.7.tar.gz) = 7N2+W/6LtbL17pJt6bEtDA== +RMD160 (gnugk-2.2.7.tar.gz) = tZGDwGcSS5MetKed67rbT74FMVQ= +SHA1 (gnugk-2.2.7.tar.gz) = 7fRUhwKgU+oELbkf8whYU8EK1CY= +SHA256 (gnugk-2.2.7.tar.gz) = TNrOSXCXfGnQzfiIQfAl6w6WV4v+mz7MRbM8y277IHM= +SIZE (gnugk-2.2.7.tar.gz) = 1160654 diff --git a/net/gnugk/patches/patch-Makefile_in b/net/gnugk/patches/patch-Makefile_in index 660538a697b..085c9d76755 100644 --- a/net/gnugk/patches/patch-Makefile_in +++ b/net/gnugk/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/27 21:10:42 ajacoutot Exp $ ---- Makefile.in.orig Thu Jul 6 20:25:19 2006 -+++ Makefile.in Fri Apr 27 17:01:28 2007 +$OpenBSD: patch-Makefile_in,v 1.2 2008/04/03 07:18:08 ajacoutot Exp $ +--- Makefile.in.orig Tue Dec 18 14:40:24 2007 ++++ Makefile.in Wed Apr 2 16:01:45 2008 @@ -111,7 +111,7 @@ STDCCFLAGS = $(temp_STDCCFLAGS) # GK version infomation STDCCFLAGS += -DMAJOR_VERSION=@GNUGK_MAJOR_VERSION@ -DMINOR_VERSION=@GNUGK_MINOR_VERSION@ -DBUILD_NUMBER=@GNUGK_BUILD_NUMBER@ @@ -18,4 +18,4 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/04/27 21:10:42 ajacoutot Exp $ +install-addpasswd: $(INSTALL) $(OBJDIR)/addpasswd $(INSTALLBIN_DIR) - # + static: diff --git a/net/gnugk/patches/patch-RasSrv_cxx b/net/gnugk/patches/patch-RasSrv_cxx deleted file mode 100644 index af109a5a5e6..00000000000 --- a/net/gnugk/patches/patch-RasSrv_cxx +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-RasSrv_cxx,v 1.1.1.1 2007/04/27 21:10:42 ajacoutot Exp $ ---- RasSrv.cxx.orig Fri Apr 27 15:53:41 2007 -+++ RasSrv.cxx Fri Apr 27 15:54:12 2007 -@@ -50,7 +50,7 @@ using namespace std; - using Routing::Route; - - #ifndef NEED_BROADCASTLISTENER --#if (defined P_LINUX) || (defined P_FREEBSD) || (defined P_HPUX9) || (defined P_SOLARIS) -+#if (defined P_LINUX) || (defined P_FREEBSD) || (defined P_HPUX9) || (defined P_SOLARIS) || (defined P_OPENBSD) - // On some OS we don't get broadcasts on a socket that is - // bound to a specific interface. For those we have to start - // a listener just for those broadcasts. diff --git a/net/gnugk/patches/patch-configure b/net/gnugk/patches/patch-configure index aa2d9530ee2..34ee0e4ae11 100644 --- a/net/gnugk/patches/patch-configure +++ b/net/gnugk/patches/patch-configure @@ -1,16 +1,29 @@ -$OpenBSD: patch-configure,v 1.3 2008/03/15 17:40:06 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.4 2008/04/03 07:18:08 ajacoutot Exp $ --- configure.orig Fri Jun 2 11:21:34 2006 -+++ configure Thu Mar 6 10:55:13 2008 -@@ -3924,7 +3924,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++++ configure Wed Apr 2 17:42:44 2008 +@@ -3884,9 +3884,15 @@ echo $ECHO_N "checking for PQconnectdb in -lpq... $ECH + + old_LIBS="$LIBS" + ++ if test `uname -s` = OpenBSD ; then ++ CRYPTO_LIBS="-lcrypto" ++ else ++ CRYPTO_LIBS="-lcrypt" ++ fi ++ + for try in /usr/lib /usr/local/lib /usr/local/pgsql/lib $pgsql_lib_dir; do + if test -d $try; then +- LIBS="$old_LIBS -L$try -lpq -lcrypt ${PGSQL_LIBS}" ++ LIBS="$old_LIBS -L$try -lpq ${CRYPTO_LIBS} ${PGSQL_LIBS}" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -3924,7 +3930,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - PGSQL_LIBS="-lpq -lcrypt ${PGSQL_LIBS}" -+ if test `uname -s` = OpenBSD ; then -+ PGSQL_LIBS="-lpq -lcrypto ${PGSQL_LIBS}" -+ else -+ PGSQL_LIBS="-lpq -lcrypt ${PGSQL_LIBS}" -+ fi ++ PGSQL_LIBS="-lpq ${CRYPTO_LIBS} ${PGSQL_LIBS}" PGSQL_LDFLAGS="-L$try" diff --git a/net/gnugk/patches/patch-gk_cxx b/net/gnugk/patches/patch-gk_cxx deleted file mode 100644 index deedc8f0168..00000000000 --- a/net/gnugk/patches/patch-gk_cxx +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-gk_cxx,v 1.1 2008/03/15 17:40:06 ajacoutot Exp $ ---- gk.cxx.orig Wed Mar 21 23:30:16 2007 -+++ gk.cxx Thu Mar 6 12:45:10 2008 -@@ -392,11 +392,13 @@ BOOL Gatekeeper::InitToolkit(const PArgList& /*args*/) - BOOL Gatekeeper::InitConfig(const PArgList &args) - { - // get the name of the config file -- PFilePath fp("gatekeeper.ini"); -+ PFilePath fp; - PString section("Gatekeeper::Main"); - - if (args.HasOption('c')) - fp = PFilePath(args.GetOptionString('c')); -+ else -+ fp = "gatekeeper.ini"; - - if (args.HasOption('s')) - section = args.GetOptionString('s'); diff --git a/net/gnugk/pkg/PLIST b/net/gnugk/pkg/PLIST index bea4a7cec90..7ed673498cf 100644 --- a/net/gnugk/pkg/PLIST +++ b/net/gnugk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2008/03/15 17:40:07 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.4 2008/04/03 07:18:08 ajacoutot Exp $ @newgroup ${GNUGK_ID}:586 @newuser ${GNUGK_ID}:586:586:daemon:Gatekeeper Daemon:/var/empty:/sbin/nologin bin/addpasswd @@ -23,11 +23,13 @@ share/examples/gnugk/gnugk.ini @sample ${SYSCONFDIR}/gatekeeper.ini @mode @group +share/examples/gnugk/h350.ini share/examples/gnugk/ipauth.ini share/examples/gnugk/mysql.ini share/examples/gnugk/nat.ini share/examples/gnugk/neighbor.ini share/examples/gnugk/proxy.ini +share/examples/gnugk/qos.ini share/examples/gnugk/radacct.ini share/examples/gnugk/radaliasauth.ini share/examples/gnugk/radauth.ini