[Midnightbsd-cvs] mports [19868] trunk/www/serf: fix build

[laffer1 at midnightbsd.org]

Revision: 19868
          http://svnweb.midnightbsd.org/mports/?rev=19868
Author:   laffer1
Date:     2015-08-20 08:53:29 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/www/serf/Makefile
    trunk/www/serf/pkg-plist

Modified: trunk/www/serf/Makefile
===================================================================
--- trunk/www/serf/Makefile	2015-08-20 12:49:58 UTC (rev 19867)
+++ trunk/www/serf/Makefile	2015-08-20 12:53:29 UTC (rev 19868)
@@ -2,7 +2,7 @@
 
 PORTNAME=	serf
 PORTVERSION=	1.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://serf.googlecode.com/svn/src_releases/
 
@@ -10,18 +10,16 @@
 COMMENT=	Serf HTTP client library
 
 LICENSE=	apache2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
 
-USE_SCONS=	yes
-USES=		tar:bzip2 cpe
+USES=		scons tar:bzip2 cpe
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS GSSAPI
 
-SCONS_ENV=	# empty
-SCONS_BUILDENV=	# empty
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
 SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
 SCONS_ARGS+=	OPENSSL=${OPENSSLBASE}
@@ -28,6 +26,7 @@
 SCONS_ARGS+=	PREFIX=${PREFIX}
 SCONS_ARGS+=	CC=${CC}
 SCONS_ARGS+=	CFLAGS="${CFLAGS}"
+INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
 
 .include <bsd.mport.options.mk>
 
@@ -35,14 +34,24 @@
 SCONS_ARGS+=	GSSAPI="/usr"
 .endif
 
+do-build:
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS})
+
+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} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so
 
 regression-test check: build
-	@(cd ${WRKSRC} && ${SCONS_BIN} check)
+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
 
 .include <bsd.port.mk>

Modified: trunk/www/serf/pkg-plist
===================================================================
--- trunk/www/serf/pkg-plist	2015-08-20 12:49:58 UTC (rev 19867)
+++ trunk/www/serf/pkg-plist	2015-08-20 12:53:29 UTC (rev 19868)
@@ -7,5 +7,3 @@
 lib/libserf-1.so.1.3.0
 libdata/pkgconfig/serf-1.pc
 %%PORTDOCS%%%%DOCSDIR%%/design-guide.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm include/serf-1