- In www/serf move libssl and libcrypto from Requires.private to

  Libs.private in serf-1.pc such that subversion-static can use
  "pkg-config --static" instead of requiring a .la file
- Remove an old libtool patch from devel/subversion

Approved by:	ohauer

3 files changed, 5 insertions, 47 deletions

diff --git a/www/serf/Makefile b/www/serf/Makefile
index dae33f78e8ec..a9c0d4670a48 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	serf
 PORTVERSION=	1.3.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://serf.googlecode.com/svn/src_releases/
 
@@ -17,9 +18,6 @@ USES=		scons tar:bzip2
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-# support for subversion-static,
-SUB_FILES=	libserf-1.la
-
 OPTIONS_DEFINE=	DOCS GSSAPI
 
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
@@ -43,12 +41,14 @@ do-install:
 	@(cd ${WRKSRC} && ${SENTENV} ${MAKE_CMD} ${SCONS_ARGS} ${INSTALL_TARGET})
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/build/serf.pc.in
+	@${REINPLACE_CMD} -E \
+		-e '/^Requires.private/s/(libssl|libcrypto)//g' \
+		-e '/^Libs.private/s|$$| -L${OPENSSLLIB} -lssl -lcrypto|' \
+		${WRKSRC}/build/serf.pc.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${SUB_FILES:S|^|${WRKDIR}/|} ${STAGEDIR}${PREFIX}/lib
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so
 
 regression-test check: build
diff --git a/www/serf/files/libserf-1.la.in b/www/serf/files/libserf-1.la.in
deleted file mode 100644
index 84f3797504c6..000000000000
--- a/www/serf/files/libserf-1.la.in
+++ /dev/null
@@ -1,41 +0,0 @@
-# libserf-1.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libserf-1.so'
-
-# Names of this library.
-library_names='libserf-1.so'
-
-# The name of the static archive.
-old_library='libserf-1.a'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=' -pthread'
-
-# Libraries that this one depends upon.
-dependency_libs=' -R%%LOCALBASE%%/lib -L/usr/lib -L%%LOCALBASE%%/lib %%LOCALBASE%%/lib/libaprutil-1.la %%LOCALBASE%%/lib/libapr-1.la -lcrypt -lz -lssl -lcrypto'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libserf-1.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='%%LOCALBASE%%/lib'
diff --git a/www/serf/pkg-plist b/www/serf/pkg-plist
index 1c464dc22fdb..36775eb22698 100644
--- a/www/serf/pkg-plist
+++ b/www/serf/pkg-plist
@@ -2,7 +2,6 @@ include/serf-1/serf.h
 include/serf-1/serf_bucket_types.h
 include/serf-1/serf_bucket_util.h
 lib/libserf-1.a
-lib/libserf-1.la
 lib/libserf-1.so
 lib/libserf-1.so.1
 lib/libserf-1.so.1.3.0