Changes 2.2.0:

* Unknown

4 files changed, 75 insertions, 81 deletions

diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index 5d63ef9a9e0..202624ca084 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,43 +1,37 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/09 20:47:21 mjl Exp $
-#
+# $NetBSD: Makefile,v 1.2 2004/12/02 12:27:08 adam Exp $
 
-DISTNAME=		gnugk-2.0.8
-CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openh323gk/}
-EXTRACT_SUFX=		.tgz
+DISTNAME=	gnugk-2.2.0
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openh323gk/}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://openh323gk.sourceforge.net/
-COMMENT=		H.323 Gatekeeper
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.gnugk.org/
+COMMENT=	H.323 Gatekeeper
 
-WRKSRC=			${WRKDIR}/openh323gk
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS=		make
-USE_PKGINSTALL=         YES
-NO_CONFIGURE=		YES
-ALL_TARGET=		opt
+USE_PKGINSTALL=         yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		ac_cv_path_PTLIB_CONFIG=${PREFIX}/bin/ptlib-config
+CONFIGURE_ENV+=		PWLIBDIR=${PREFIX}/share/pwlib
+CONFIGURE_ENV+=		OPENH323DIR=${PREFIX}/share/openh323
+
+CFLAGS+=	-fexceptions
+MAKE_ENV+=	LIBTOOL="${LIBTOOL}" SYSLIBDIR="${PREFIX}/lib"
 
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-
 CONF_FILES=		${EGDIR}/gnugk.ini ${PKG_SYSCONFDIR}/gnugk.ini
-RCD_SCRIPTS=	gnugk
-
-MAKE_ENV+=		PWLIBDIR=${PREFIX} OPENH323DIR=${PREFIX} SYSLIBDIR=${PREFIX}/lib
-MAKE_ENV+=		NO_RADIUS=1 NO_LDAP=1 NO_MYSQL=1 NO_PGSQL=1 LIBTOOL=${LIBTOOL}
+RCD_SCRIPTS=		gnugk
 
 post-install:
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/doc/${PKGBASE}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/docs; \
-	for f in `find . -type f -print` ; do \
-	  ${INSTALL_DATA} $$f ${PREFIX}/doc/${PKGBASE}; done
-	cd ${WRKSRC}/etc; \
-	for f in `find . -type f -print` ; do \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
+	cd ${WRKSRC}/docs; for f in `find . -type f -print` ; do \
+	  ${INSTALL_DATA} $$f ${PREFIX}/share/doc/${PKGBASE}; done
+	cd ${WRKSRC}/etc; for f in `find . -type f -print` ; do \
 	  ${INSTALL_DATA} $$f ${EGDIR}; done
 
-.include "../../devel/pwlib/buildlink3.mk"
 .include "../../net/openh323/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnugk/PLIST b/net/gnugk/PLIST
index 7bc06b042f3..24bbf5b6fcd 100644
--- a/net/gnugk/PLIST
+++ b/net/gnugk/PLIST
@@ -1,55 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/09 20:47:21 mjl Exp $
-doc/gnugk/GkStatusMsgFmt.html
-doc/gnugk/changing_ip.txt
-doc/gnugk/comparison.txt
-doc/gnugk/compiling.txt
-doc/gnugk/gk_faq.html
-doc/gnugk/gkstatus.txt
-doc/gnugk/performance.txt
-doc/gnugk/reference.txt
-doc/gnugk/signalling.txt
-doc/gnugk/test-status.txt
-doc/gnugk/todo.txt
-doc/gnugk/tutorial.txt
-doc/gnugk/Windows_LDAP_Servers.txt
-doc/gnugk/wldap_OIDs.txt
-doc/gnugk/wldap_compiling.txt
-doc/gnugk/wldap_ini.txt
-doc/gnugk/RELEASE-NOTES
-doc/gnugk/manual-1.html
-doc/gnugk/manual-pt.sgml
-doc/gnugk/manual.sgml
-doc/gnugk/manual-zh.sgml
-doc/gnugk/radauth.txt
-doc/gnugk/wldapauth.txt
-doc/gnugk/manual-2.html
-doc/gnugk/manual-3.html
-doc/gnugk/manual-4.html
-doc/gnugk/manual-5.html
-doc/gnugk/manual.html
+@comment $NetBSD: PLIST,v 1.2 2004/12/02 12:27:08 adam Exp $
 bin/gnugk
-share/examples/gnugk/radaliasauth.ini
+share/doc/gnugk/GkStatusMsgFmt.html
+share/doc/gnugk/changing_ip.txt
+share/doc/gnugk/comparison.txt
+share/doc/gnugk/compiling.txt
+share/doc/gnugk/copying
+share/doc/gnugk/gk_faq.html
+share/doc/gnugk/gkstatus.txt
+share/doc/gnugk/manual.sgml
+share/doc/gnugk/performance.txt
+share/doc/gnugk/reference.txt
+share/doc/gnugk/signalling.txt
+share/doc/gnugk/test-status.txt
+share/doc/gnugk/trace_levels.txt
+share/doc/gnugk/tutorial.txt
 share/examples/gnugk/billing.pl
 share/examples/gnugk/child.ini
-share/examples/gnugk/citron.ini
 share/examples/gnugk/complete.ini
-share/examples/gnugk/failover.ini
 share/examples/gnugk/fileacct.ini
-share/examples/gnugk/gnugk.ini
-share/examples/gnugk/ldap_reg.pl
 share/examples/gnugk/mysql.ini
 share/examples/gnugk/neighbor.ini
-share/examples/gnugk/password.ini
 share/examples/gnugk/proxy.ini
 share/examples/gnugk/radacct.ini
-share/examples/gnugk/radius_billing.pl
+share/examples/gnugk/radaliasauth.ini
 share/examples/gnugk/radauth.ini
 share/examples/gnugk/routed.ini
 share/examples/gnugk/rrqauth.ini
 share/examples/gnugk/sql.ini
 share/examples/gnugk/status.ini
-share/examples/gnugk/voip.schema
 share/examples/gnugk/unregister_ip.pl
 share/examples/gnugk/vqueue.ini
-@dirrm doc/gnugk
 @dirrm share/examples/gnugk
+@dirrm share/doc/gnugk
diff --git a/net/gnugk/distinfo b/net/gnugk/distinfo
index d43e3332817..980b06fe869 100644
--- a/net/gnugk/distinfo
+++ b/net/gnugk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/09 20:47:21 mjl Exp $
+$NetBSD: distinfo,v 1.2 2004/12/02 12:27:08 adam Exp $
 
-SHA1 (gnugk-2.0.8.tgz) = 3ce42e17b9f47b96d6e5923f4504e1c7a09a79be
-Size (gnugk-2.0.8.tgz) = 689053 bytes
-SHA1 (patch-aa) = 34f2b05f14875c20299ea2787c264b606974d210
+SHA1 (gnugk-2.2.0.tgz) = 27bf0fe7f2d7952233eb3522d55618269770a6ef
+Size (gnugk-2.2.0.tgz) = 627215 bytes
+SHA1 (patch-aa) = e7f9f1b31bed309224eac1a84db2207c36e3e3f5
diff --git a/net/gnugk/patches/patch-aa b/net/gnugk/patches/patch-aa
index a64e82f3d01..e0aaf9dee87 100644
--- a/net/gnugk/patches/patch-aa
+++ b/net/gnugk/patches/patch-aa
@@ -1,16 +1,37 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/09 20:47:21 mjl Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/02 12:27:08 adam Exp $
 
---- Makefile.orig	2004-10-09 09:27:17.000000000 +0200
-+++ Makefile	2004-10-09 09:27:40.000000000 +0200
-@@ -119,9 +119,9 @@
- OPENH323DIR=$(HOME)/openh323
- endif
+--- Makefile.in.orig	2004-08-06 13:44:10.000000000 +0000
++++ Makefile.in
+@@ -47,8 +47,8 @@ space:=$(empty) $(empty)
+ .DELETE_ON_ERROR:
  
--VERSION_FILE := $(OPENH323DIR)/version.h
-+VERSION_FILE := $(OPENH323DIR)/include/openh323/version.h
+ # setup various important paths
+-PWLIBDIR=@PWLIBDIR@
+-OPENH323DIR=@OPENH323DIR@
++PWLIBDIR=${PREFIX}
++OPENH323DIR=${PREFIX}
+ OPENH323MAKEDIR=@OPENH323MAKEDIR@
  
--include $(OPENH323DIR)/openh323u.mak
-+include $(OPENH323DIR)/share/openh323/openh323u.mak
+ ifndef TMP
+@@ -73,10 +73,10 @@ gkdefault: bothdepend bothshared
  
- ### Remove -fdata-sections gcc option that cause problems during link step
- temp_STDCCFLAGS := $(subst -fdata-sections,,$(STDCCFLAGS))
+ # LD_RUN_LIST is the list form of the LD_RUN_PATH
+ LD_RUN_LIST := $(subst $(colon),$(space),$(LD_RUN_PATH))
+-LD_RUN_LIST += $(PWLIBDIR)/lib $(OPENH323DIR)/lib
++LD_RUN_LIST += ${PREFIX}/lib
+ 
+ # compiler/linker flags set by configure script
+-STDCCFLAGS += @STDCCFLAGS@
++STDCCFLAGS += @STDCCFLAGS@ ${CXXFLAGS}
+ LDFLAGS    += @LDFLAGS@
+ ENDLDLIBS  += @ENDLDLIBS@
+ ENDLDFLAGS += @ENDLDFLAGS@
+@@ -111,7 +111,7 @@ versionts.h: $(subst version.cxx,,$(SOUR
+ 
+ # extra targets
+ addpasswd: $(OBJDIR)/addpasswd.o
+-	$(CXX) -o $(OBJDIR)/addpasswd $(CFLAGS) $(OBJDIR)/addpasswd.o $(LDFLAGS) -l$(PTLIB_BASE)$(LIB_TYPE) $(ENDLDLIBS) $(ENDLDFLAGS)
++	$(CXX) -o $(OBJDIR)/addpasswd $(CXXFLAGS) $(OBJDIR)/addpasswd.o $(LDFLAGS) -l$(PTLIB_BASE)$(LIB_TYPE) $(ENDLDLIBS) $(ENDLDFLAGS)
+ 
+ doc:	docs/manual.sgml
+ 	cd docs; sgml2html manual.sgml; \