ports/95447: net/generic-nqs maintainer update

Tony Maher anthony.maher at uts.edu.au
Thu Apr 6 23:20:14 UTC 2006


>Number:         95447
>Category:       ports
>Synopsis:       net/generic-nqs maintainer update
>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:   Thu Apr 06 23:20:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Tony Maher
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD karma.internal 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Tue Apr 4 22:24:50 EST 2006 root at karma.internal:/var/obj/usr/src/sys/KARMA i386


>Description:
	As reported by an email from Kris@ net/generic-nqs does not compile.
	Investigation showed as it uses  malloc.h instead of stdlib.h

>How-To-Repeat:
	cd /usr/ports/net/generic-nqs
	make

>Fix:
	The following patch adds a REINPLACE_CMD to cahnge malloc.h
	to stdlib.h
	Also bring the startup script into the new world order.
	I hope I have this correct (it works on 6.1-Prerelease).

diff -ruN generic-nqs.orig/Makefile generic-nqs/Makefile
--- generic-nqs.orig/Makefile	Thu Apr  6 19:13:51 2006
+++ generic-nqs/Makefile	Thu Apr  6 15:40:31 2006
@@ -17,8 +17,6 @@
 MAINTAINER=		tonymaher at optusnet.com.au
 COMMENT=		Generic Network Queuing System
 
-BROKEN=			Does not compile
-
 USE_BZIP2=		yes
 IS_INTERACTIVE=	yes
 NO_PACKAGE=		have to build on site due to the descriptors created in\
@@ -104,6 +102,7 @@
 	${SED} -e 's|-O6 -fno-strength-reduce|${CFLAGS}|' \
 	${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig \
 	> ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh
+	@${REINPLACE_CMD} -e 's#<malloc.h>#<stdlib.h>#;' `${FIND} ${WRKSRC} -type f`
 
 pre-configure:
 	@ ${SED} -e 's|XX_CFLAGS_XX|${CFLAGS}|' ${FILESDIR}/${TEMPLATE} > ${PLATFORMDIR}/${PLATFORM}; \
diff -ruN generic-nqs.orig/files/nqs.sh generic-nqs/files/nqs.sh
--- generic-nqs.orig/files/nqs.sh	Sun Nov 18 03:06:51 2001
+++ generic-nqs/files/nqs.sh	Thu Apr  6 18:59:02 2006
@@ -1,19 +1,35 @@
 #!/bin/sh
+#
 
-case $1 in
-start)
-	if [ -x XXXX/sbin/nqsdaemon ] ; then
-	    XXXX/sbin/nqsdaemon > /var/log/nqs.log
-	    echo -n ' nqs' 
-	fi
-	;;
-stop)
-	killall -KILL nqsdaemon netdaemon loaddaemon && echo -n ' nqs'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
+# PROVIDE: nqs
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: LOGIN
+# KEYWORD: shutdown
 
-exit 0
+#
+# Add the following lines to /etc/rc.conf to enable NQS:
+# nqs_enable (bool):      Set to "NO" by default.
+#                             Set it to "YES" to enable NQS
+
+. /etc/rc.subr
+
+name="nqs"
+rcvar=`set_rcvar`
+
+prefix="XXXX"
+logfile="/var/log/nqs.log"
+start_cmd="nqs_start"
+stop_cmd="nqs_stop"
+load_rc_config $name
+
+nqs_start()
+{
+	$prefix/sbin/nqsdaemon >> ${logfile} 2>&1 && echo 'Starting nqs.'
+}
+
+nqs_stop()
+{
+	/usr/bin/killall -KILL nqsdaemon netdaemon loaddaemon && echo 'Stopping nqs.'
+}
+
+run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list