6 files changed, 108 insertions, 80 deletions

diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index a28fe8097e83..fc7d53ad426f 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -6,76 +6,112 @@
 #
 
 PORTNAME=	gatekeeper
-PORTVERSION=	2.2.2
-PORTREVISION=	4
+#PORTVERSION=	2.2.3
+DISTVERSION=	2.2.3-2
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openh323gk
-DISTNAME=	gnugk-${PORTVERSION}
+MASTER_SITE_SUBDIR= openh323gk
+DISTNAME=	gnugk-${DISTVERSION}
 
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT=	GnuGK is GPL Gate Keeper for OhPhone, GnomeMeeting, NetMeeting and H323
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
+LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
-USE_RC_SUBR=	yes
-RC_DIR=		${PREFIX}/etc/rc.d
+WRKSRC=		${WRKDIR}/${MASTER_SITE_SUBDIR}-${DISTVERSION:C/-[0-9]$//}
 
-USE_AUTOTOOLS=	autoconf:259
-CONFIGURE_ENV=	${MAKE_ENV}
+USE_RC_SUBR=	gnugk.sh
 
-NOCLEANDEPENDS=	yes
+USE_AUTOTOOLS=	autoconf:259
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-USE_BISON=	yes
 USE_GMAKE=	yes
-ALL_TARGET=	optnoshared addpasswd
-MAKE_ENV=	PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \
-		OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323
-THE_MACHTYPE=	${ARCH:S/i386/x86/}
-MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} HAS_RADACCT=1
+ALL_TARGET=	optshared addpasswd
+MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
+		SYSLIBDIR=${LOCALBASE}/lib
+MAKE_ARGS=	OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \
+		OSRELEASE=${OSVERSION} CPLUS=${CXX}
+
+PLIST_SUB=	PORTNAME=${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/openh323
+EXAMPLESDIR=	${PREFIX}/share/examples/openh323
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=		does not build
+.endif
+
+.if defined(WITH_FDSET)
+CONFIGURE_ARGS+=	--with-large-fdset=${WITH_FDSET}
+.endif
+
 .if ${OSVERSION} >= 500000
+. if defined(WITH_RADIUS)
 CONFIGURE_ARGS+=	--enable-radius
-.else
+. else
 CONFIGURE_ARGS+=	--disable-radius
+. endif
 .endif
 
-#.if defined(WITH_MYSQL)
-#USE_MYSQL=	41
-#CONFIGURE_ARGS+=	--enable-mysql \
-#			--with-mysql-dir=${LOCALBASE}
-#.else
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=	--enable-mysql \
+			--with-mysql-dir=${LOCALBASE}
+.else
 CONFIGURE_ARGS+=	--disable-mysql
-#.endif
+.endif
 
-#.if defined(WITH_PGSQL)
-#USE_PGSQL=	yes
-#CONFIGURE_ARGS+=	--enable-pgsql \
-#			--with-pgsql-dir=${LOCALBASE}
-#.else
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=	--enable-pgsql
+.else
 CONFIGURE_ARGS+=	--disable-pgsql
-#.endif
+.endif
 
-pre-install:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-	    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-	    ${FILESDIR}/gnugk.sh.sample > ${WRKDIR}/gnugk.sh
+pre-everything::
+.if !defined(WITH_RADIUS) || !defined(WITH_MYSQL) || !defined(WITH_PGSQL) || !defined(WITH_FDSET)
+	@${ECHO_MSG} "Additional build options are:"
+	@${ECHO_MSG} ""
+.endif
+.if ${OSVERSION} >= 500000
+. ifndef(WITH_RADIUS)
+	@${ECHO_MSG} "WITH_RADIUS=yes - enable Radius support"
+	@${ECHO_MSG} ""
+. endif
+.endif
+.ifndef(WITH_MYSQL)
+	@${ECHO_MSG} "WITH_MYSQL=yes - enable the MySQL backend"
+	@${ECHO_MSG} ""
+.endif
+.ifndef(WITH_PGSQL)
+	@${ECHO_MSG} "WITH_PGSQL=yes - enable the PostgreSQL backend"
+	@${ECHO_MSG} ""
+.endif
+.ifndef(WITH_FDSET)
+	@${ECHO_MSG} "WITH_FDSET=<some number> - expand the 'Maximum number of sockets'"
+	@${ECHO_MSG} "Default is: 1024"
+	@${ECHO_MSG} ""
+.endif
 
 pre-su-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/gnugk ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/addpasswd ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/gnugk ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/addpasswd ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/etc/complete.ini ${PREFIX}/etc/gnugk.ini.default
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKSRC}/etc/*.ini ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/${PORTNAME}
+	@${CP} -Rp ${WRKSRC}/docs/*.txt ${DOCSDIR}/${PORTNAME}
+.endif
+	@${MKDIR} ${EXAMPLESDIR}/${PORTNAME}
+	@${CP} -Rp ${WRKSRC}/etc/*.ini ${EXAMPLESDIR}/${PORTNAME}
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/gnugk.sh ${RC_DIR}
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/net/gatekeeper/distinfo b/net/gatekeeper/distinfo
index 1c053c9e1727..215c2497b583 100644
--- a/net/gatekeeper/distinfo
+++ b/net/gatekeeper/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnugk-2.2.2.tar.gz) = 689d1239273d21daba5746fd128d3184
-SHA256 (gnugk-2.2.2.tar.gz) = 44f48bff536c2435f98dc0138b856f180aaf942ba39e4c16ae124b3698954a91
-SIZE (gnugk-2.2.2.tar.gz) = 562982
+MD5 (gnugk-2.2.3-2.tar.gz) = 63ecb94c16f34efebd08d16234d8d4a1
+SHA256 (gnugk-2.2.3-2.tar.gz) = 3081ff4394c8157be652b1585a11379b28abc5461bc2b616cd11dc5738a914b5
+SIZE (gnugk-2.2.3-2.tar.gz) = 779662
diff --git a/net/gatekeeper/files/gnugk.sh.sample b/net/gatekeeper/files/gnugk.sh.in
index 80cec7929650..80cec7929650 100644
--- a/net/gatekeeper/files/gnugk.sh.sample
+++ b/net/gatekeeper/files/gnugk.sh.in
diff --git a/net/gatekeeper/files/patch-Makefile.in b/net/gatekeeper/files/patch-Makefile.in
deleted file mode 100644
index e46dc82e2ae2..000000000000
--- a/net/gatekeeper/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Mon Jun 20 14:16:12 2005
-+++ Makefile.in	Mon Jun 20 14:17:08 2005
-@@ -76,7 +76,7 @@
- LD_RUN_LIST += $(PWLIBDIR)/lib $(OPENH323DIR)/lib
- 
- # compiler/linker flags set by configure script
--STDCCFLAGS += @STDCCFLAGS@
-+STDCCFLAGS += @STDCCFLAGS@ -DPASN_LEANANDMEAN=1
- LDFLAGS    += @LDFLAGS@
- ENDLDLIBS  += @ENDLDLIBS@
- ENDLDFLAGS += @ENDLDFLAGS@
-@@ -111,7 +111,7 @@
- 
- # 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 $(CFLAGS) $(OBJDIR)/addpasswd.o $(LDFLAGS) -l$(PTLIB_BASE)$(LIB_TYPE)_s $(ENDLDLIBS) $(ENDLDFLAGS)
- 
- doc:
- 	$(MAKE) -C docs/manual html
diff --git a/net/gatekeeper/pkg-install b/net/gatekeeper/pkg-install
index aea34263e80a..dd753f8ba1cc 100644
--- a/net/gatekeeper/pkg-install
+++ b/net/gatekeeper/pkg-install
@@ -74,7 +74,10 @@ POST-INSTALL)
 	echo "     o A sample configuration file for this package is installed"
 	echo "       as ${gnugk_config}."
 	echo "       More example configurations can be found in"
-	echo "       ${PKG_PREFIX}/share/examples/gatekeeper."
+	echo "       ${PKG_PREFIX}/share/examples/openh323/gatekeeper."
+	echo ""
+	echo "     o Documantation can be found in"
+	echo "       ${PKG_PREFIX}/share/doc/openh323/gatekeeper."
 	echo ""
 	echo "     o A log directory has been created in ${gnugk_logdir}."
 	echo ""
diff --git a/net/gatekeeper/pkg-plist b/net/gatekeeper/pkg-plist
index b9efe7fc8886..0147bc3b6365 100644
--- a/net/gatekeeper/pkg-plist
+++ b/net/gatekeeper/pkg-plist
@@ -1,21 +1,30 @@
 @unexec %D/etc/rc.d/gnugk.sh forcestop 2>/dev/null || true
-bin/gnugk
 bin/addpasswd
-etc/rc.d/gnugk.sh
+bin/gnugk
 etc/gnugk.ini.default
-share/examples/gatekeeper/child.ini
-share/examples/gatekeeper/clirw.ini
-share/examples/gatekeeper/complete.ini
-share/examples/gatekeeper/fileacct.ini
-share/examples/gatekeeper/mysql.ini
-share/examples/gatekeeper/neighbor.ini
-share/examples/gatekeeper/proxy.ini
-share/examples/gatekeeper/radacct.ini
-share/examples/gatekeeper/radaliasauth.ini
-share/examples/gatekeeper/radauth.ini
-share/examples/gatekeeper/routed.ini
-share/examples/gatekeeper/rrqauth.ini
-share/examples/gatekeeper/sql.ini
-share/examples/gatekeeper/status.ini
-share/examples/gatekeeper/vqueue.ini
-@dirrm share/examples/gatekeeper
+%%EXAMPLESDIR%%/%%PORTNAME%%/child.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/clirw.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/complete.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/fileacct.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/gnugk.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/ipauth.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/mysql.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/neighbor.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/proxy.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/radacct.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/radaliasauth.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/radauth.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/routed.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/rrqauth.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/sql.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/status.ini
+%%EXAMPLESDIR%%/%%PORTNAME%%/vqueue.ini
+@dirrm %%EXAMPLESDIR%%/%%PORTNAME%%
+@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/keepalive.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/known_bugs.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/performance.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/radauth.txt
+%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/trace_levels.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%