[Midnightbsd-cvs] mports [17860] trunk/devel/boehm-gc: cleanup build of boehm-gc

[laffer1 at midnightbsd.org]

Revision: 17860
          http://svnweb.midnightbsd.org/mports/?rev=17860
Author:   laffer1
Date:     2014-11-12 07:45:10 -0500 (Wed, 12 Nov 2014)
Log Message:
-----------
cleanup build of boehm-gc

Modified Paths:
--------------
    trunk/devel/boehm-gc/Makefile
    trunk/devel/boehm-gc/pkg-plist

Modified: trunk/devel/boehm-gc/Makefile
===================================================================
--- trunk/devel/boehm-gc/Makefile	2014-11-12 12:42:03 UTC (rev 17859)
+++ trunk/devel/boehm-gc/Makefile	2014-11-12 12:45:10 UTC (rev 17860)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gc
 PORTVERSION=	7.4.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hboehm.info/gc/gc_source/
 PKGNAMEPREFIX=	boehm-
@@ -21,7 +22,6 @@
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig
-USE_AUTOTOOLS=	aclocal autoconf libtoolize
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-cplusplus --disable-static
@@ -34,11 +34,11 @@
 .ifdef GC_VARIANT
 INSTLIBS=	cord gc gccpp
 PLIST=		${NONEXISTENT}
-PLIST_FILES=	${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so.${SOVER},g} \
-		${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so,g} \
+PLIST_FILES=	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
+		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
+		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \
 		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
 RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc
-SOVER=		1
 . if ${GC_VARIANT} == "redirect"
 CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc
 . endif
@@ -53,8 +53,10 @@
 PORTDOCS=	*
 .endif
 
-.include <bsd.port.pre.mk>
 
+
+.include <bsd.mport.options.mk>
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-gc-debug
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+fulldebug
@@ -75,15 +77,12 @@
 	@${REINPLACE_CMD} -e \
 		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
 
-do-install:
-.for LIB in ${INSTLIBS}
-	${INSTALL_DATA} ${WRKSRC}/.libs/lib${LIB}-${GC_VARIANT}.so.${SOVER} \
-		${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so.${SOVER}
-	${LN} -sf lib${LIB}-${GC_VARIANT}.so.${SOVER} \
-		${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/bdw-gc.pc \
-		${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
+post-install:
+	${RM} -r ${STAGEDIR}${PREFIX}/include
+	${RM} -r ${STAGEDIR}${PREFIX}/share
+	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
+
 .else # ! GC_VARIANT
 
 post-patch:
@@ -93,19 +92,13 @@
 		${WRKSRC}/Makefile.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${MAN3PREFIX}/man/man3/gc.3
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
+	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${STAGEDIR}${MAN3PREFIX}/man/man3/gc.3
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .endif
 
-# Get rid of .la and static library files
-#
-post-configure:
-	@${REINPLACE_CMD} -E -e \
-	'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
-
 regression-test: build
-	cd ${WRKSRC} && ${MAKE} check
+	(cd ${WRKSRC} && ${MAKE_CMD} check)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/devel/boehm-gc/pkg-plist
===================================================================
--- trunk/devel/boehm-gc/pkg-plist	2014-11-12 12:42:03 UTC (rev 17859)
+++ trunk/devel/boehm-gc/pkg-plist	2014-11-12 12:45:10 UTC (rev 17860)
@@ -19,13 +19,10 @@
 include/gc_cpp.h
 lib/libcord.so
 lib/libcord.so.1
-lib/libcord.so.1.0.3
 lib/libgc.so
 lib/libgc.so.1
-lib/libgc.so.1.0.3
 lib/libgccpp.so
 lib/libgccpp.so.1
-lib/libgccpp.so.1.0.3
 libdata/pkgconfig/bdw-gc.pc
 man/man3/gc.3.gz
 @dirrm include/gc