Update net/openslp to 1.0.6. This package now uses the general INSTALL

scripts and honors ${PKG_SYSCONFDIR}.  Changes from version 1.0.2 include:

* bug fixes
* set FRESH flag for registrations; OpenSLP ignores this flag, but other DA
  implementations like K&A SLP do not.
* Minor changes to the way that settings from /etc/slp.conf affect active and
  passive discovery.
* Changed declaration and definition for strncasecmp and strcasecmp so that
  there is only one place for them in slp_compare.c and slp_compare.h
* Honor scopes in SrvRqsts for the special "service:directory-agent" type
* Added code to use IP address in agent url for those operating systems where
  gethostname() does not return a fully qualified domain name (FQDN).
* Added code to log parse errors and dump bad messages to the log
* Fixed reconnect code to be able to interoperate with inefficient DAs that
  close the stream after each srvreg/srvack exchange.  The Mac OS/X DA is
  reported to have this problem
* Removed calls that (sort of) enforce service-url checking.  This is for the
  benefit of AFP's usage of SRVLOC.  Developers are now trusted not to
  register ambiguous service-urls.

7 files changed, 108 insertions, 250 deletions

diff --git a/net/openslp/DEINSTALL b/net/openslp/DEINSTALL
deleted file mode 100644
index 75567cf1ef3..00000000000
--- a/net/openslp/DEINSTALL
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:57:14 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CMP="@CMP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/openslp
-CONFDIR=/etc
-CONFFILES="slp.conf slp.reg slp.spi"
-
-case ${STAGE} in
-DEINSTALL)
-	# Remove configuration files if they don't differ from the default
-	# config file.
-	#
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if ${CMP} -s ${FILE} ${SAMPLEFILE}
-		then
-			${RM} -f ${FILE}
-		fi
-	done
-	;;
-
-POST-DEINSTALL)
-	modified_files=''
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			modified_files="${modified_files} ${FILE}"
-		fi
-	done
-
-	existing_dirs=''
-
-	if [ -n "${modified_files}" ]
-	then
-        	${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-EOF
-		if [ -n "${modified_files}" ]
-		then
-			${CAT} << EOF
-
-  * the following files:
-
-EOF
-			for file in ${modified_files}
-			do
-				echo "	${file}"
-			done
-		fi
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/net/openslp/INSTALL b/net/openslp/INSTALL
deleted file mode 100644
index 551bd794bcb..00000000000
--- a/net/openslp/INSTALL
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:57:15 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-CP="@CP@"
-MKDIR="@MKDIR@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/openslp
-CONFDIR=/etc
-CONFFILES="slp.conf slp.reg slp.spi"
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	${MKDIR} ${CONFDIR}
-	echo "Installing configuration files:"
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 644 ${FILE}
-		fi
-	done
-	${CAT} << EOF
-
-===========================================================================
-Some files you might need to customize include the following:
-
-EOF
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		echo "	${FILE}"
-	done
-        ${CAT} << EOF
-===========================================================================
-EOF
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index fe2a2193e2a..a871d934467 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/09/14 02:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/14 22:30:07 jlam Exp $
 
-DISTNAME=	openslp-1.0.2
+DISTNAME=	openslp-1.0.6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openslp/}
 
@@ -8,40 +8,28 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.openslp.org/
 COMMENT=	Open-source implementation of the Service Location Protocol
 
-USE_BUILDLINK_ONLY=	# defined
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--sysconfdir=/etc
+USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 
-USE_LIBTOOL=		# defined
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
-FILES_SUBST=		PREFIX=${PREFIX}
-FILES_SUBST+=		CAT=${CAT:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		ECHO=${ECHO:Q}
-FILES_SUBST+=		MKDIR=${MKDIR:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		RMDIR=${RMDIR:Q}
-FILES_SUBST+=		TRUE=${TRUE:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-DOCDIR=			${PREFIX}/share/doc/openslp
-EGDIR=			${PREFIX}/share/examples/openslp
-HTMLDIR=		${PREFIX}/share/doc/html/openslp
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+HTMLDIR=		${PREFIX}/share/doc/html/${PKGBASE}
+
+CONF_FILES=		${EGDIR}/slp.conf ${PKG_SYSCONFDIR}/slp.conf
+CONF_FILES+=		${EGDIR}/slp.reg ${PKG_SYSCONFDIR}/slp.reg
+CONF_FILES+=		${EGDIR}/slp.spi ${PKG_SYSCONFDIR}/slp.spi
+RCD_SCRIPTS=		slpd
 
 post-extract:
-	${FIND} ${WRKSRC}/doc -name "CVS" -print | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf
 
 pre-install:
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/slpd.sh > ${WRKDIR}/slpd.sh
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/slpd.sh > ${WRKDIR}/slpd.sh
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/slpd.sh ${PREFIX}/etc/rc.d/slpd
@@ -53,6 +41,6 @@ post-install:
 	cd ${WRKSRC}/doc; ${CP} -r html/* ${HTMLDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} ${HTMLDIR}
 	${CHMOD} -R a-w ${DOCDIR} ${HTMLDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openslp/PLIST b/net/openslp/PLIST
index 969f00f32ff..a3f96b9ace5 100644
--- a/net/openslp/PLIST
+++ b/net/openslp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/14 22:30:07 jlam Exp $
 bin/slptool
 etc/rc.d/slpd
 include/slp.h
@@ -8,69 +8,69 @@ lib/libslp.so
 lib/libslp.so.1
 lib/libslp.so.1.0
 sbin/slpd
-share/doc/html/openslp/IntroductionToSLP/AgentInit.jpg
-share/doc/html/openslp/IntroductionToSLP/ServiceReg.jpg
-share/doc/html/openslp/IntroductionToSLP/ServiceRqst.jpg
-share/doc/html/openslp/IntroductionToSLP/index.html
-share/doc/html/openslp/ProgrammersGuide/Callbacks.html
-share/doc/html/openslp/ProgrammersGuide/Divergence.html
-share/doc/html/openslp/ProgrammersGuide/Examples.html
-share/doc/html/openslp/ProgrammersGuide/SLPAttrCallback.html
-share/doc/html/openslp/ProgrammersGuide/SLPClose.html
-share/doc/html/openslp/ProgrammersGuide/SLPDelAttrs.html
-share/doc/html/openslp/ProgrammersGuide/SLPDereg.html
-share/doc/html/openslp/ProgrammersGuide/SLPError.html
-share/doc/html/openslp/ProgrammersGuide/SLPEscape.html
-share/doc/html/openslp/ProgrammersGuide/SLPFindAttrs.html
-share/doc/html/openslp/ProgrammersGuide/SLPFindScopes.html
-share/doc/html/openslp/ProgrammersGuide/SLPFindSrvTypes.html
-share/doc/html/openslp/ProgrammersGuide/SLPFindSrvs.html
-share/doc/html/openslp/ProgrammersGuide/SLPFree.html
-share/doc/html/openslp/ProgrammersGuide/SLPGetProperty.html
-share/doc/html/openslp/ProgrammersGuide/SLPGetRefreshInterval.html
-share/doc/html/openslp/ProgrammersGuide/SLPOpen.html
-share/doc/html/openslp/ProgrammersGuide/SLPParseSrvURL.html
-share/doc/html/openslp/ProgrammersGuide/SLPReg.html
-share/doc/html/openslp/ProgrammersGuide/SLPRegReport.html
-share/doc/html/openslp/ProgrammersGuide/SLPSetProperty.html
-share/doc/html/openslp/ProgrammersGuide/SLPSrvTypeCallback.html
-share/doc/html/openslp/ProgrammersGuide/SLPSrvURLCallback.html
-share/doc/html/openslp/ProgrammersGuide/SLPTypes.html
-share/doc/html/openslp/ProgrammersGuide/SLPUnescape.html
-share/doc/html/openslp/ProgrammersGuide/Security.html
-share/doc/html/openslp/ProgrammersGuide/Syntax.html
-share/doc/html/openslp/ProgrammersGuide/index.html
-share/doc/html/openslp/ProgrammersGuide/openslp_security_whitepaper.html
-share/doc/html/openslp/ProgrammersGuide/smalllogo.jpg
-share/doc/html/openslp/UsersGuide/CommandLine.html
-share/doc/html/openslp/UsersGuide/FileLocations.html
-share/doc/html/openslp/UsersGuide/Installation.html
-share/doc/html/openslp/UsersGuide/Optimization.html
-share/doc/html/openslp/UsersGuide/Security.html
-share/doc/html/openslp/UsersGuide/SlpConf.html
-share/doc/html/openslp/UsersGuide/SlpReg.html
-share/doc/html/openslp/UsersGuide/UserFAQ.html
-share/doc/html/openslp/UsersGuide/WhenToRunSlpd.html
-share/doc/html/openslp/UsersGuide/WhoShouldRead.html
-share/doc/html/openslp/UsersGuide/index.html
-share/doc/html/openslp/UsersGuide/smalllogo.jpg
-share/doc/html/openslp/faq.html
-share/doc/openslp/rfc1766.txt
-share/doc/openslp/rfc2165.txt
-share/doc/openslp/rfc2254.txt
-share/doc/openslp/rfc2396.txt
-share/doc/openslp/rfc2608.txt
-share/doc/openslp/rfc2609.txt
-share/doc/openslp/rfc2610.txt
-share/doc/openslp/rfc2614.txt
-share/doc/openslp/srvreg-integrity.txt
-share/doc/openslp/threat_analysis_min_security.html
-share/examples/openslp/slp.conf
-share/examples/openslp/slp.reg
-share/examples/openslp/slp.spi
-@dirrm share/examples/openslp
-@dirrm share/doc/openslp
-@dirrm share/doc/html/openslp/UsersGuide
-@dirrm share/doc/html/openslp/ProgrammersGuide
-@dirrm share/doc/html/openslp/IntroductionToSLP
-@dirrm share/doc/html/openslp
+share/doc/html/${PKGBASE}/IntroductionToSLP/AgentInit.jpg
+share/doc/html/${PKGBASE}/IntroductionToSLP/ServiceReg.jpg
+share/doc/html/${PKGBASE}/IntroductionToSLP/ServiceRqst.jpg
+share/doc/html/${PKGBASE}/IntroductionToSLP/index.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/Callbacks.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/Divergence.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/Examples.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPAttrCallback.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPClose.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPDelAttrs.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPDereg.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPError.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPEscape.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindAttrs.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindScopes.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindSrvTypes.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFindSrvs.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPFree.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPGetProperty.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPGetRefreshInterval.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPOpen.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPParseSrvURL.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPReg.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPRegReport.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPSetProperty.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPSrvTypeCallback.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPSrvURLCallback.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPTypes.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/SLPUnescape.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/Security.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/Syntax.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/index.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/openslp_security_whitepaper.html
+share/doc/html/${PKGBASE}/ProgrammersGuide/smalllogo.jpg
+share/doc/html/${PKGBASE}/UsersGuide/CommandLine.html
+share/doc/html/${PKGBASE}/UsersGuide/FileLocations.html
+share/doc/html/${PKGBASE}/UsersGuide/Installation.html
+share/doc/html/${PKGBASE}/UsersGuide/Optimization.html
+share/doc/html/${PKGBASE}/UsersGuide/Security.html
+share/doc/html/${PKGBASE}/UsersGuide/SlpConf.html
+share/doc/html/${PKGBASE}/UsersGuide/SlpReg.html
+share/doc/html/${PKGBASE}/UsersGuide/UserFAQ.html
+share/doc/html/${PKGBASE}/UsersGuide/WhenToRunSlpd.html
+share/doc/html/${PKGBASE}/UsersGuide/WhoShouldRead.html
+share/doc/html/${PKGBASE}/UsersGuide/index.html
+share/doc/html/${PKGBASE}/UsersGuide/smalllogo.jpg
+share/doc/html/${PKGBASE}/faq.html
+share/doc/${PKGBASE}/rfc1766.txt
+share/doc/${PKGBASE}/rfc2165.txt
+share/doc/${PKGBASE}/rfc2254.txt
+share/doc/${PKGBASE}/rfc2396.txt
+share/doc/${PKGBASE}/rfc2608.txt
+share/doc/${PKGBASE}/rfc2609.txt
+share/doc/${PKGBASE}/rfc2610.txt
+share/doc/${PKGBASE}/rfc2614.txt
+share/doc/${PKGBASE}/srvreg-integrity.txt
+share/doc/${PKGBASE}/threat_analysis_min_security.html
+share/examples/${PKGBASE}/slp.conf
+share/examples/${PKGBASE}/slp.reg
+share/examples/${PKGBASE}/slp.spi
+@dirrm share/examples/${PKGBASE}
+@dirrm share/doc/${PKGBASE}
+@dirrm share/doc/html/${PKGBASE}/UsersGuide
+@dirrm share/doc/html/${PKGBASE}/ProgrammersGuide
+@dirrm share/doc/html/${PKGBASE}/IntroductionToSLP
+@dirrm share/doc/html/${PKGBASE}
diff --git a/net/openslp/distinfo b/net/openslp/distinfo
index b15a2bb2ef9..a5613ee086b 100644
--- a/net/openslp/distinfo
+++ b/net/openslp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/09/14 02:56:25 jlam Exp $
+$NetBSD: distinfo,v 1.3 2001/12/14 22:30:07 jlam Exp $
 
-SHA1 (openslp-1.0.2.tar.gz) = 67baf9a96bfe8ee04bd60959473102deac5e9aa3
-Size (openslp-1.0.2.tar.gz) = 587308 bytes
-SHA1 (patch-aa) = 43da60884805f412be2de6c9fdd4f3234e5a1ba6
+SHA1 (openslp-1.0.6.tar.gz) = 1ce55daf3e74b383641bbc09a7694f4b6633843a
+Size (openslp-1.0.6.tar.gz) = 593530 bytes
+SHA1 (patch-aa) = a324a75ca0482f127abafba39cfa00f37d9f4ba9
diff --git a/net/openslp/files/slpd.sh b/net/openslp/files/slpd.sh
index a77046f74bb..868b8524c52 100644
--- a/net/openslp/files/slpd.sh
+++ b/net/openslp/files/slpd.sh
@@ -5,7 +5,7 @@
 # PROVIDE: slpd
 # REQUIRE: DAEMON
 
-if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -e /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,11 +16,11 @@ command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/slp.conf"
 
-if [ ! -d /etc/rc.d ]
+if [ -e /etc/rc.subr ]
 then
+	load_rc_config $name
+	run_rc_command "$1"
+else
 	@ECHO@ -n " ${name}"
-	exec ${command} ${slpd_flags} ${command_args}
+	${command} ${slpd_flags} ${command_args}
 fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/openslp/patches/patch-aa b/net/openslp/patches/patch-aa
index 0e596002e51..3fb7d8a3af8 100644
--- a/net/openslp/patches/patch-aa
+++ b/net/openslp/patches/patch-aa
@@ -1,21 +1,25 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/18 03:18:44 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/14 22:30:08 jlam Exp $
 
---- Makefile.in.orig	Tue Aug  7 13:00:29 2001
-+++ Makefile.in
-@@ -333,20 +333,6 @@
+--- Makefile.in.orig	Mon Dec 10 12:58:48 2001
++++ Makefile.in	Fri Dec 14 17:11:51 2001
+@@ -333,24 +333,6 @@
  
  
  install-data-local:
 -	mkdir -p $(DESTDIR)$(sysconfdir)
 -	file=$(DESTDIR)$(sysconfdir)/slp.reg;\
--        if [ -f $$file ]; then cp -f $$file $$file.bak; else true; fi
--	cp -f $(srcdir)/etc/slp.reg $(DESTDIR)$(sysconfdir)
+-        if [ -f $$file ]; then true;\
+-	else cp -f $(srcdir)/etc/slp.reg $(DESTDIR)$(sysconfdir);\
+-	fi
 -	file=$(DESTDIR)$(sysconfdir)/slp.conf;\
--	if [ -f $$file ]; then cp -f $$file $$file.bak; else true; fi
--	cp -f $(srcdir)/etc/slp.conf $(DESTDIR)$(sysconfdir)
+-	if [ -f $$file ]; then true;\
+-	else cp -f $(srcdir)/etc/slp.conf \
+-	$(DESTDIR)$(sysconfdir);\
+-	fi
 -	file=$(DESTDIR)$(sysconfdir)/slp.spi;\
--	if [ -f $$file ]; then cp -f $$file $$file.bak; else true; fi
--	cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir)
+-	if [ -f $$file ]; then true;\
+-	else cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir);\
+-	fi
 -	rm -rf $(DESTDIR)$(DOC_DIR)
 -	mkdir -p $(DESTDIR)$(DOC_DIR)
 -	cp -r $(srcdir)/doc/* $(DESTDIR)$(DOC_DIR)