Upgrade to latest stable release.

Note LDAP has been disabled in the port Makefile to allow the port to
compile.

3 files changed, 42 insertions, 26 deletions

diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index af233cafcaf0..b22c77476c0e 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gatekeeper
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	2.0a
 CATEGORIES=	net
 MASTER_SITES=	http://www.gnugk.org/download/
-DISTNAME=	gk10
+DISTNAME=	gk-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	roger@FreeBSD.org
@@ -27,9 +26,9 @@ ALL_TARGET=	optnoshared
 MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/pwlib \
 		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323
 THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX}
+MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} NO_LDAP=1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/gk ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/gnugk ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/gatekeeper/distinfo b/net/gatekeeper/distinfo
index 3d6b9805274a..9ac6387d3415 100644
--- a/net/gatekeeper/distinfo
+++ b/net/gatekeeper/distinfo
@@ -1 +1 @@
-MD5 (gk10.tgz) = 40f9af49c719966dd6221509e1b93ad3
+MD5 (gk-2.0a.tgz) = e50c950ded7dce161d443535c6ee9db8
diff --git a/net/gatekeeper/files/patch-aa b/net/gatekeeper/files/patch-aa
index 428c2a656d1f..86dbf006a3e6 100644
--- a/net/gatekeeper/files/patch-aa
+++ b/net/gatekeeper/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile.orig	Sat May 25 00:20:04 2002
---- Makefile	Sat May 25 00:21:51 2002
+*** Makefile.orig	Thu May 30 08:54:51 2002
+--- Makefile	Fri Oct 11 06:57:42 2002
 *************** ifndef OPENH323DIR
-*** 13,26 ****
+*** 16,26 ****
   OPENH323DIR=$(HOME)/openh323
   endif
   
@@ -9,14 +9,11 @@
 ! H323_LIBDIR	= ${OPENH323DIR}/lib
 ! H323_LIB	= h323_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
   
-! LDFLAGS		= -L$(H323_LIBDIR)
-! LDLIBS		= -l$(H323_LIB)
+! STDCCFLAGS := -DLDAP_HAS_CACHE -I${H323_INCDIR} -DPTRACING#-DPASN_NOPRINT
+  #-DLDAP_HAS_CACHE : do not use ldap-cache (alpha)
   
-! STDCCFLAGS := -I${H323_INCDIR} -DPTRACING  #-DPASN_NOPRINT
-  
-  
-  ifndef PWLIBDIR
---- 13,26 ----
+  # use destination analysis list
+--- 16,28 ----
   OPENH323DIR=$(HOME)/openh323
   endif
   
@@ -24,21 +21,41 @@
 ! ##H323_LIBDIR	= ${OPENH323DIR}/lib
 ! ##H323_LIB	= h323_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
   
-! ##LDFLAGS		= -L$(H323_LIBDIR)
-! ##LDLIBS		= -l$(H323_LIB)
+! ##STDCCFLAGS := -I${H323_INCDIR} -DPTRACING#-DPASN_NOPRINT
+! 
+! STDCCFLAGS := -DLDAP_HAS_CACHE
+  #-DLDAP_HAS_CACHE : do not use ldap-cache (alpha)
   
-! ##STDCCFLAGS := -I${H323_INCDIR} -DPTRACING  #-DPASN_NOPRINT
+  # use destination analysis list
+*************** endif
+*** 142,155 ****
+  endif
+  endif
   
+! LDFLAGS		+= -L$(H323_LIBDIR)
+! LDLIBS		+= -l$(H323_LIB)
   
   ifndef PWLIBDIR
-*************** ifndef PWLIBDIR
-*** 28,33 ****
---- 28,35 ----
+  PWLIBDIR=$(HOME)/pwlib
+  endif
+  
+! include $(PWLIBDIR)/make/ptlib.mak
+  
+  ifdef HAS_LEVEL_TWO_LDAPAPI
+  TARGET_LIBS += $(LDAP_LIB)
+--- 144,158 ----
+  endif
   endif
   
-  include $(PWLIBDIR)/make/ptlib.mak
-+ include $(OPENH323DIR)/openh323u.mak
-+ 
+! #LDFLAGS		+= -L$(H323_LIBDIR)
+! #LDLIBS		+= -l$(H323_LIB)
+  
+  ifndef PWLIBDIR
+  PWLIBDIR=$(HOME)/pwlib
+  endif
   
+! #include $(PWLIBDIR)/make/ptlib.mak
+! include $(OPENH323DIR)/openh323u.mak
   
-  # Extra dependencies
+  ifdef HAS_LEVEL_TWO_LDAPAPI
+  TARGET_LIBS += $(LDAP_LIB)