[Midnightbsd-cvs] mports [19555] trunk/net/openslp: fix install

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 30 21:46:01 EDT 2015


Revision: 19555
          http://svnweb.midnightbsd.org/mports/?rev=19555
Author:   laffer1
Date:     2015-06-30 21:46:01 -0400 (Tue, 30 Jun 2015)
Log Message:
-----------
fix install

Modified Paths:
--------------
    trunk/net/openslp/Makefile
    trunk/net/openslp/distinfo
    trunk/net/openslp/pkg-plist

Added Paths:
-----------
    trunk/net/openslp/files/patch-Makefile.in
    trunk/net/openslp/files/patch-configure

Removed Paths:
-------------
    trunk/net/openslp/files/patch-aa
    trunk/net/openslp/files/patch-ac

Modified: trunk/net/openslp/Makefile
===================================================================
--- trunk/net/openslp/Makefile	2015-07-01 01:44:24 UTC (rev 19554)
+++ trunk/net/openslp/Makefile	2015-07-01 01:46:01 UTC (rev 19555)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openslp
 PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/OpenSLP/${PORTVERSION}
 
@@ -10,8 +10,9 @@
 COMMENT=	Open-source implementation of the Service Location Protocol
 LICENSE=	bsd3
 
-USES=	libtool
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openslp \
@@ -19,19 +20,13 @@
 
 USE_RC_SUBR=	slpd
 
-OPTIONS=	SLP_SECURITY "Turn on SLPv2 security support" off \
-		ASYNC_API "Enable asynchronous communication API" off
+OPTIONS_DEFINE=	SLP_SECURITY ASYNC_API DOCS
+SLP_SECURITY_DESC=	Turn on SLPv2 security support
+ASYNC_API_DESC=		Enable asynchronous communication API
 
-.include <bsd.port.pre.mk>
+SLP_SECURITY_CONFIGURE_ENABLE=	slpv2-security
+ASYNC_API_CONFIGURE_ENABLE=	async-api
 
-.if defined(WITH_SLP_SECURITY)
-CONFIGURE_ARGS+=	--enable-slpv2-security
-.endif
-
-.if defined(WITH_ASYNC_API)
-CONFIGURE_ARGS+=	--enable-async-api
-.endif
-
 post-extract:
 	@(cd ${WRKSRC}; \
 		${FIND} doc -type f -path '*/CVS/*' -delete; \
@@ -39,13 +34,9 @@
 
 post-install:
 .for FILE in slp.conf slp.reg slp.spi
-	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${PREFIX}/etc/openslp/${FILE}.default
+	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${PREFIX}/etc/openslp/${FILE}.sample
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	(cd ${INSTALL_WRKSRC}/doc; \
-		${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; ;\
-		${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;)
-.endif
+	(cd ${INSTALL_WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/net/openslp/distinfo
===================================================================
--- trunk/net/openslp/distinfo	2015-07-01 01:44:24 UTC (rev 19554)
+++ trunk/net/openslp/distinfo	2015-07-01 01:46:01 UTC (rev 19555)
@@ -1,3 +1,2 @@
 SHA256 (openslp-1.2.1.tar.gz) = 08c7ec1e76fdd66461b3784d52047f594405f31ba2791ab0c1ec7c97639f5fbd
-RMD160 (openslp-1.2.1.tar.gz) = a31d516ba784ad893a740946082fe5e0f15a37ea
 SIZE (openslp-1.2.1.tar.gz) = 886195

Added: trunk/net/openslp/files/patch-Makefile.in
===================================================================
--- trunk/net/openslp/files/patch-Makefile.in	                        (rev 0)
+++ trunk/net/openslp/files/patch-Makefile.in	2015-07-01 01:46:01 UTC (rev 19555)
@@ -0,0 +1,23 @@
+--- 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
+ 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`
+ 
+ dist-hook:
+ 	-rm -rf `find $(distdir)/doc -name CVS`


Property changes on: trunk/net/openslp/files/patch-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net/openslp/files/patch-aa
===================================================================
--- trunk/net/openslp/files/patch-aa	2015-07-01 01:44:24 UTC (rev 19554)
+++ trunk/net/openslp/files/patch-aa	2015-07-01 01:46:01 UTC (rev 19555)
@@ -1,23 +0,0 @@
---- 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
- 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`
- 
- dist-hook:
- 	-rm -rf `find $(distdir)/doc -name CVS`

Deleted: trunk/net/openslp/files/patch-ac
===================================================================
--- trunk/net/openslp/files/patch-ac	2015-07-01 01:44:24 UTC (rev 19554)
+++ trunk/net/openslp/files/patch-ac	2015-07-01 01:46:01 UTC (rev 19555)
@@ -1,11 +0,0 @@
---- configure~	Thu Sep 13 01:13:37 2001
-+++ configure	Fri Sep 21 02:42:01 2001
-@@ -1832,7 +1832,7 @@
-         OPTFLAGS="-O"
-     fi
- fi
--CFLAGS="$CFLAGS $OPTFLAGS"
-+#CFLAGS="$CFLAGS $OPTFLAGS"
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:1839: checking how to run the C preprocessor" >&5

Added: trunk/net/openslp/files/patch-configure
===================================================================
--- trunk/net/openslp/files/patch-configure	                        (rev 0)
+++ trunk/net/openslp/files/patch-configure	2015-07-01 01:46:01 UTC (rev 19555)
@@ -0,0 +1,11 @@
+--- configure~	Thu Sep 13 01:13:37 2001
++++ configure	Fri Sep 21 02:42:01 2001
+@@ -1832,7 +1832,7 @@
+         OPTFLAGS="-O"
+     fi
+ fi
+-CFLAGS="$CFLAGS $OPTFLAGS"
++#CFLAGS="$CFLAGS $OPTFLAGS"
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ echo "configure:1839: checking how to run the C preprocessor" >&5


Property changes on: trunk/net/openslp/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net/openslp/pkg-plist
===================================================================
--- trunk/net/openslp/pkg-plist	2015-07-01 01:44:24 UTC (rev 19554)
+++ trunk/net/openslp/pkg-plist	2015-07-01 01:46:01 UTC (rev 19555)
@@ -1,19 +1,12 @@
 bin/slptool
- at unexec if cmp -s %D/etc/openslp/slp.reg %D/etc/openslp/slp.reg.default; then rm -f %D/etc/openslp/slp.reg; fi
-etc/openslp/slp.reg.default
- at exec [ -f %B/slp.reg ] || cp %B/%f %B/slp.reg
- at unexec if cmp -s %D/etc/openslp/slp.conf %D/etc/openslp/slp.conf.default; then rm -f %D/etc/openslp/slp.conf; fi
-etc/openslp/slp.conf.default
- at exec [ -f %B/slp.conf ] || cp %B/%f %B/slp.conf
- at unexec if cmp -s %D/etc/openslp/slp.spi %D/etc/openslp/slp.spi.default; then rm -f %D/etc/openslp/slp.spi; fi
-etc/openslp/slp.spi.default
- at exec [ -f %B/slp.spi ] || cp %B/%f %B/slp.spi
- at dirrm etc/openslp
+ at sample etc/openslp/slp.conf.sample
+ at sample etc/openslp/slp.reg.sample
+ at sample etc/openslp/slp.spi.sample
 include/slp.h
 lib/libslp.a
-lib/libslp.la
 lib/libslp.so
 lib/libslp.so.1
+lib/libslp.so.1.0.1
 sbin/slpd
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1766.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2165.txt
@@ -72,9 +65,3 @@
 %%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%%



More information about the Midnightbsd-cvs mailing list