ports/186603: [patch] net/libsocket++: USES=libtool, staging,...

[Tijl Coosemans]

>Number:         186603
>Category:       ports
>Synopsis:       [patch] net/libsocket++: USES=libtool, staging,...
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 09 20:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Convert USE_AUTOTOOLS=libtool to USES=libtool.
- Replace pre-configure target with USE_AUTOTOOLS.
- Staging and DOCS option.
>How-To-Repeat:
>Fix:

--- libsocket++.patch begins here ---
Index: net/libsocket++/Makefile
===================================================================
--- net/libsocket++/Makefile	(revision 343455)
+++ net/libsocket++/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libsocket++
 PORTVERSION=	1.12.13
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://src.linuxhacker.at/socket++/
 DISTNAME=	socket++-${PORTVERSION}
@@ -12,21 +13,20 @@
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
+
+OPTIONS_DEFINE=	DOCS
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake autoconf libtool
-SCRIPTS_ENV+=	ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
+USES=		libtool
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
+AUTOMAKE_ARGS=	-a -c
+LIBTOOLIZE_ARGS=-i -c
 
 INFO=	socket++
 
-NO_STAGE=	yes
-pre-configure:
-	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen)
-
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/libsocket++
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/libsocket++
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: net/libsocket++/files/patch-autogen
===================================================================
--- net/libsocket++/files/patch-autogen	(revision 343455)
+++ net/libsocket++/files/patch-autogen	(working copy)
@@ -1,20 +0,0 @@
---- autogen.orig	Tue Mar 18 15:47:57 2003
-+++ autogen	Wed Jul  7 17:45:10 2004
-@@ -14,12 +14,12 @@
- else
-- 	libtoolize --automake
-+ 	${LIBTOOLIZE} --automake
- fi 
- echo "aclocal..."
--aclocal
-+${ACLOCAL} ${ACLOCAL_FLAGS}
- echo "autoheader..."
--autoheader
-+${AUTOHEADER}
- echo "automake..."
--automake --add-missing
-+${AUTOMAKE} --add-missing
- echo "autoconf..."
--autoconf
-+${AUTOCONF}
- 
Index: net/libsocket++/pkg-descr
===================================================================
--- net/libsocket++/pkg-descr	(revision 343455)
+++ net/libsocket++/pkg-descr	(working copy)
@@ -9,4 +9,4 @@
 
 Socket++ is covered by the GPL.
 
-WWW:	http://www.linuxhacker.at/socketxx/
+WWW: http://www.linuxhacker.at/socketxx/
Index: net/libsocket++/pkg-plist
===================================================================
--- net/libsocket++/pkg-plist	(revision 343455)
+++ net/libsocket++/pkg-plist	(working copy)
@@ -1,7 +1,8 @@
 lib/libsocket++.a
 lib/libsocket++.la
+lib/libsocket++.so
 lib/libsocket++.so.1
-lib/libsocket++.so
+lib/libsocket++.so.1.0.2
 include/socket++/fork.h
 include/socket++/echo.h
 include/socket++/ftp.h
@@ -12,6 +13,6 @@
 include/socket++/sockinet.h
 include/socket++/sockstream.h
 include/socket++/sockunix.h
-%%PORTDOCS%%share/doc/libsocket++/README
- at dirrm share/doc/libsocket++
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/socket++
--- libsocket++.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: