serf is not yet used by anything in the ports tree but will
eventually be used by Subversion 1.8.

serf 1.3.0 switches to the scons build system, and I'd like to get
over that hump now. Review by scons experts welcome.

The serf build fails if unknown variables are set in the scons
environment. So I need to override MODSCONS_ENV. Also, the install
target doesn't like DESTDIR so I need a custom do-install target.
Additionally, the scons module doesn't seem to support 'make test'
so I need a custom do-test target as well.

I'm not sure if there are better ways of working around these issues.
But it works.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/serf/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile    7 Aug 2013 21:32:25 -0000       1.2
+++ Makefile    8 Aug 2013 16:15:23 -0000
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.2 2013/08/07 21:32:25 naddy Exp $
 
 COMMENT =              high performance HTTP client library
-DISTNAME =             serf-1.2.0
-REVISION =             0
-SHARED_LIBS =          serf-1                    0.0 # 0.0
+DISTNAME =             serf-1.3.0
+SHARED_LIBS =          serf-1                    1.0 # 0.0
 CATEGORIES =           net
 HOMEPAGE =             https://code.google.com/p/serf/
 MAINTAINER =           Stefan Sperling <s...@openbsd.org>
@@ -15,11 +14,25 @@ WANTLIB =           apr-1 aprutil-1 crypto db ex
 MASTER_SITES =         https://serf.googlecode.com/files/
 EXTRACT_SUFX =         .tar.bz2
 
-MODULES =              converters/libiconv
+MODULES =              converters/libiconv \
+                       devel/scons
 LIB_DEPENDS =          devel/apr-util
-CONFIGURE_STYLE =      gnu
-CONFIGURE_ARGS +=      --with-apr=${LOCALBASE}/bin/apr-1-config \
-                       --with-apr-util=${LOCALBASE}/bin/apu-1-config
-TEST_TARGET =          check
+MODSCONS_ENV=  CC="${CC}" \
+               LINKFLAGS="${LDFLAGS}" \
+               PREFIX="${PREFIX}" \
+               DEBUG=0 \
+               APR=${LOCALBASE}/bin/apr-1-config \
+               APU=${LOCALBASE}/bin/apu-1-config
+
+do-install:
+       ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \
+               ${MODSCONS_ENV} ${MODSCONS_FLAGS} ${INSTALL_TARGET}
+
+post-install:
+       mv ${PREFIX}/lib/libserf-1.so \
+               ${PREFIX}/lib/libserf-1.so.${LIBserf-1_VERSION}
+
+do-test:
+       ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} check
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/serf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    17 May 2013 12:48:56 -0000      1.1.1.1
+++ distinfo    8 Aug 2013 15:46:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (serf-1.2.0.tar.bz2) = IBoKJbzEwKwmzKQOd+p1uYZ4M16CW+5ZmiMPsjZZNfM=
-SIZE (serf-1.2.0.tar.bz2) = 178128
+SHA256 (serf-1.3.0.tar.bz2) = F0pGhmkHxUMJwMysXvo0ME4hl582WzC9/qbErTMOwBw=
+SIZE (serf-1.3.0.tar.bz2) = 136426
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/serf/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   17 May 2013 12:48:57 -0000      1.1.1.1
+++ pkg/PLIST   8 Aug 2013 16:01:21 -0000
@@ -4,7 +4,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 lib/libserf-1.so.${LIBserf-1_VERSION}
 lib/pkgconfig/
 lib/pkgconfig/serf-1.pc

Reply via email to