6 files changed, 95 insertions, 127 deletions

diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 46374cf75436..5933b6eb4d68 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openslp
-PORTVERSION=	1.0.11
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openslp
@@ -15,14 +14,20 @@ MASTER_SITE_SUBDIR=	openslp
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open-source implementation of the Service Location Protocol
 
-.if defined(WITH_SLP_SECURITY)
+USE_LIBTOOL_VER=15
 USE_OPENSSL=	yes
-.endif
-
-GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openslp \
 		--localstatedir=/var
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+
+USE_RC_SUBR=	yes
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
+OPTIONS=	SLP_SECURITY "Turn on SLPv2 security support" off \
+		ASYNC_API "Enable asynchronous communication API" off
+
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_SLP_SECURITY)
 CONFIGURE_ARGS+=	--enable-slpv2-security
@@ -32,18 +37,6 @@ CONFIGURE_ARGS+=	--enable-slpv2-security
 CONFIGURE_ARGS+=	--enable-async-api
 .endif
 
-INSTALLS_SHLIB=	yes
-USE_RC_SUBR=	yes
-
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "OpenSLP has the following tunable option(s):"
-	@${ECHO_MSG} "		WITH_SLP_SECURITY=yes	Turns on SLPv2 security support"
-	@${ECHO_MSG} "		WITH_ASYNC_API=yes	Enable asynchronous communication API"
-	@${ECHO_MSG} ""
-
 post-extract:
 	@(cd ${WRKSRC}; \
 		${FIND} doc -type f -path '*/CVS/*' -delete; \
@@ -63,4 +56,4 @@ post-install:
 		${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/openslp/distinfo b/net/openslp/distinfo
index 8afdb9d07a10..d22f9ca9e8ed 100644
--- a/net/openslp/distinfo
+++ b/net/openslp/distinfo
@@ -1,2 +1,2 @@
-MD5 (openslp-1.0.11.tar.gz) = 0ec965956ad1f66850f050b19c828b55
-SIZE (openslp-1.0.11.tar.gz) = 608138
+MD5 (openslp-1.2.1.tar.gz) = ff9999d1b44017281dd00ed2c4d32330
+SIZE (openslp-1.2.1.tar.gz) = 886195
diff --git a/net/openslp/files/patch-aa b/net/openslp/files/patch-aa
index 3014ef8a9843..5b7e81856ede 100644
--- a/net/openslp/files/patch-aa
+++ b/net/openslp/files/patch-aa
@@ -1,23 +1,23 @@
---- Makefile.in.orig	Mon Jan 28 13:27:17 2002
-+++ Makefile.in	Thu Feb  7 13:50:38 2002
-@@ -78,8 +78,7 @@
- VERSION = @VERSION@
- 
+--- Makefile.in.orig	Wed Mar  2 13:00:22 2005
++++ Makefile.in	Mon Jul  4 18:14:34 2005
+@@ -184,8 +184,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  SUBDIRS = common libslpattr slpd libslp slptool test
 -EXTRA_DIST = win32 doc etc README.W32 FAQ
 -DOC_DIR = $(prefix)/doc/openslp-$(VERSION)
 +EXTRA_DIST = win32 etc README.W32 FAQ
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =  slp.list
-@@ -347,10 +346,6 @@
- 	if [ -f $$file ]; then true;\
- 	else cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir);\
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -624,10 +623,6 @@
+ 	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)
--#	rm -rf `find $(DESTDIR)$(DOC_DIR) -name CVS`
+-	rm -rf `find $(DESTDIR)$(DOC_DIR) -name CVS`
  
  dist-hook:
- #	rm -rf `find $(distdir)/doc -name CVS`
+ 	-rm -rf `find $(distdir)/doc -name CVS`
diff --git a/net/openslp/files/patch-ltmain.sh b/net/openslp/files/patch-ltmain.sh
deleted file mode 100644
index 2ac052749556..000000000000
--- a/net/openslp/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/openslp/pkg-descr b/net/openslp/pkg-descr
index 9aea41e94520..8cc3ccbf0f8c 100644
--- a/net/openslp/pkg-descr
+++ b/net/openslp/pkg-descr
@@ -1,5 +1,5 @@
-Service Location Protocol is an IETF standards track protocol that provides a 
+Service Location Protocol is an IETF standards track protocol that provides a
 framework to allow networking applications to discover the existence, location,
-and configuration of networked services in enterprise networks. 
+and configuration of networked services in enterprise networks.
 
 WWW: http://www.openslp.org/
diff --git a/net/openslp/pkg-plist b/net/openslp/pkg-plist
index 8405a30a3d82..e825bac95885 100644
--- a/net/openslp/pkg-plist
+++ b/net/openslp/pkg-plist
@@ -11,70 +11,70 @@ etc/openslp/slp.spi.default
 @dirrm etc/openslp
 etc/rc.d/001slpd.sh
 include/slp.h
-lib/libslp.so.1
-lib/libslp.so
 lib/libslp.a
+lib/libslp.so
+lib/libslp.so.1
 sbin/slpd
-%%PORTDOCS%%share/doc/openslp/rfc/rfc1766.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2165.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2254.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2396.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2608.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2609.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2610.txt
-%%PORTDOCS%%share/doc/openslp/rfc/rfc2614.txt
-%%PORTDOCS%%share/doc/openslp/rfc/srvreg-integrity.txt
-%%PORTDOCS%%share/doc/openslp/rfc/threat_analysis_min_security.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/Callbacks.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/Divergence.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/Examples.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPAttrCallback.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPClose.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPDelAttrs.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPDereg.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPError.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPEscape.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPFindAttrs.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPFindScopes.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPFindSrvTypes.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPFindSrvs.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPFree.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPGetProperty.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPGetRefreshInterval.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPOpen.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPReg.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPParseSrvURL.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPRegReport.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPSetProperty.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPSrvTypeCallback.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPSrvURLCallback.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPTypes.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/SLPUnescape.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/Security.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/Syntax.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/index.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/openslp_security_whitepaper.html
-%%PORTDOCS%%share/doc/openslp/html/ProgrammersGuide/smalllogo.jpg
-%%PORTDOCS%%share/doc/openslp/html/IntroductionToSLP/AgentInit.jpg
-%%PORTDOCS%%share/doc/openslp/html/IntroductionToSLP/ServiceReg.jpg
-%%PORTDOCS%%share/doc/openslp/html/IntroductionToSLP/ServiceRqst.jpg
-%%PORTDOCS%%share/doc/openslp/html/IntroductionToSLP/index.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/CommandLine.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/FileLocations.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/Installation.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/Optimization.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/Security.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/SlpConf.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/SlpReg.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/UserFAQ.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/WhenToRunSlpd.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/WhoShouldRead.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/index.html
-%%PORTDOCS%%share/doc/openslp/html/UsersGuide/smalllogo.jpg
-%%PORTDOCS%%share/doc/openslp/html/faq.html
-%%PORTDOCS%%@dirrm share/doc/openslp/html/UsersGuide
-%%PORTDOCS%%@dirrm share/doc/openslp/html/IntroductionToSLP
-%%PORTDOCS%%@dirrm share/doc/openslp/html/ProgrammersGuide
-%%PORTDOCS%%@dirrm share/doc/openslp/html
-%%PORTDOCS%%@dirrm share/doc/openslp/rfc
-%%PORTDOCS%%@dirrm share/doc/openslp
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1766.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2165.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2254.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2396.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2608.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2609.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2610.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2614.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/srvreg-integrity.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/threat_analysis_min_security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Divergence.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPAttrCallback.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPClose.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPDelAttrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPDereg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPError.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPEscape.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindAttrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindScopes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindSrvTypes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindSrvs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFree.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPGetProperty.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPGetRefreshInterval.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPOpen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPReg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPParseSrvURL.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPRegReport.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSetProperty.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSrvTypeCallback.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSrvURLCallback.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPTypes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPUnescape.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Syntax.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/openslp_security_whitepaper.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/smalllogo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/AgentInit.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/ServiceReg.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/ServiceRqst.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/CommandLine.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/FileLocations.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Optimization.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/SlpConf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/SlpReg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/UserFAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/WhenToRunSlpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/WhoShouldRead.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/smalllogo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/UsersGuide
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/IntroductionToSLP
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ProgrammersGuide
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%