Date: Fri, 24 Mar 2006 22:51:57 +0100 (CET) From: Joerg Pulz <Joerg.Pulz@frm2.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Sergey Matveychuk <sem@FreeBSD.org> Subject: ports/94914: [maintainer] update net/gatekeeper to v2.2.3-2 Message-ID: <200603242151.k2OLpv6L050125@hades.admin.frm2> Resent-Message-ID: <200603242200.k2OM0XxE020049@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94914
>Category: ports
>Synopsis: [maintainer] update net/gatekeeper to v2.2.3-2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 24 22:00:33 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Joerg Pulz
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386
>Description:
Update net/gatekeeper to the latest version v2.2.3-2
Makefile:
- chase new version
- make use of DISTVERSION to handle the version number
- convert to use the new versions of devel/pwlib and net/openh323
- convert to the new USE_RC_SUBR style
- remove NOCLEANDEPENDS, its only of use for the old pwlib/openh323
- remove other useless stuff (pre-install, USE_BISON, ...)
- make use of DOCSDIR and EXAMPLESDIR like in net/openam
- add WITH_RADIUS knob instead of enabling it by default
- enable the MySQL and PostGreSQL backends
- add pre-everything to give users a hint about the available knobs
- adjust directories in do-install, add DOCS installation
- remove useless line from post-install
distinfo:
- regen for the new distfile
pkg-plist:
- let USE_RC_SUBR handle the rcNG script removal when deinstalling
- add documentation files
- make use of EXAMPLESDIR and DOCSDIR
pkg-install:
- adjust the path for examples
- add documentation part
files/gnugk.sh.sample
- removed
files/gnugk.sh.in
- is a copy of gnugk.sh.sample to get it handled by USE_RC_SUBR
files/patch-Makefile.in
- removed, no longer needed
>How-To-Repeat:
>Fix:
Apply the patch, add new files and delete emty files.
--- gatekeeper.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gatekeeper/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile 5 Feb 2006 12:35:08 -0000 1.41
+++ Makefile 24 Mar 2006 21:25:43 -0000
@@ -6,76 +6,108 @@
#
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 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
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/gatekeeper/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo 22 Jan 2006 21:23:03 -0000 1.18
+++ distinfo 24 Mar 2006 21:25:43 -0000
@@ -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
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/net/gatekeeper/pkg-install,v
retrieving revision 1.1
diff -u -r1.1 pkg-install
--- pkg-install 23 Jun 2005 14:46:40 -0000 1.1
+++ pkg-install 24 Mar 2006 21:25:43 -0000
@@ -74,7 +74,10 @@
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 ""
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/gatekeeper/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist 23 Jun 2005 14:46:40 -0000 1.4
+++ pkg-plist 24 Mar 2006 21:25:43 -0000
@@ -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%%
Index: files/gnugk.sh.in
===================================================================
RCS file: files/gnugk.sh.in
diff -N files/gnugk.sh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/gnugk.sh.in 24 Mar 2006 21:25:43 -0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net/gatekeeper/files/gnugk.sh.sample,v 1.1 2005/06/23 14:46:41 pav Exp $
+#
+# PROVIDE: gnugk
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+#
+# Add to /etc/rc.conf to enable gnugk:
+# gnugk_enable="YES"
+#
+# Additional options for /etc/rc.conf
+# gnugk_user="the user that should run gnugk" (def: gnugk)
+# gnugk_config"path to the config file to use" (def: /usr/local/etc/gnugk.ini)
+# gnugk_logfile="path to the logfile to log to" (def: /var/log/gnugk/gnugk.log)
+# gnugk_pidfile="path to the pidfile to use" (def: /var/run/gnugk/gnugk.pid)
+# gnugk_flags="additional flags you need" (def: -t)
+
+. %%RC_SUBR%%
+
+name="gnugk"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/${name}"
+extra_commands="reload"
+
+load_rc_config $name
+
+gnugk_user=${gnugk_user:-${name}}
+gnugk_config=${gnugk_config:-"%%PREFIX%%/etc/${name}.ini"}
+gnugk_logfile=${gnugk_logfile:-"/var/log/${name}/${name}.log"}
+gnugk_pidfile=${gnugk_pidfile:-"/var/run/${name}/${name}.pid"}
+
+# use some defaults if no flags are specified in /etc/rc.conf
+gnugk_flags=${gnugk_flags:-"-t"}
+
+required_files=${gnugk_conf}
+pidfile=${gnugk_pidfile}
+command_args="-u ${gnugk_user} -c ${gnugk_config} -o ${gnugk_logfile} --pid ${pidfile} >/dev/null &"
+
+run_rc_command "$1"
Index: files/gnugk.sh.sample
===================================================================
RCS file: files/gnugk.sh.sample
diff -N files/gnugk.sh.sample
--- files/gnugk.sh.sample 23 Jun 2005 14:46:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/gatekeeper/files/gnugk.sh.sample,v 1.1 2005/06/23 14:46:41 pav Exp $
-#
-# PROVIDE: gnugk
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-#
-# Add to /etc/rc.conf to enable gnugk:
-# gnugk_enable="YES"
-#
-# Additional options for /etc/rc.conf
-# gnugk_user="the user that should run gnugk" (def: gnugk)
-# gnugk_config"path to the config file to use" (def: /usr/local/etc/gnugk.ini)
-# gnugk_logfile="path to the logfile to log to" (def: /var/log/gnugk/gnugk.log)
-# gnugk_pidfile="path to the pidfile to use" (def: /var/run/gnugk/gnugk.pid)
-# gnugk_flags="additional flags you need" (def: -t)
-
-. %%RC_SUBR%%
-
-name="gnugk"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/bin/${name}"
-extra_commands="reload"
-
-load_rc_config $name
-
-gnugk_user=${gnugk_user:-${name}}
-gnugk_config=${gnugk_config:-"%%PREFIX%%/etc/${name}.ini"}
-gnugk_logfile=${gnugk_logfile:-"/var/log/${name}/${name}.log"}
-gnugk_pidfile=${gnugk_pidfile:-"/var/run/${name}/${name}.pid"}
-
-# use some defaults if no flags are specified in /etc/rc.conf
-gnugk_flags=${gnugk_flags:-"-t"}
-
-required_files=${gnugk_conf}
-pidfile=${gnugk_pidfile}
-command_args="-u ${gnugk_user} -c ${gnugk_config} -o ${gnugk_logfile} --pid ${pidfile} >/dev/null &"
-
-run_rc_command "$1"
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- files/patch-Makefile.in 23 Jun 2005 14:46:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
--- gatekeeper.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603242151.k2OLpv6L050125>