Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jul 2014 19:00:02 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361278 - head/net-p2p/dclib
Message-ID:  <201407081900.s68J022v032342@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Tue Jul  8 19:00:02 2014
New Revision: 361278
URL: http://svnweb.freebsd.org/changeset/ports/361278
QAT: https://qat.redports.org/buildarchive/r361278/

Log:
  - USES=libtool pathfix tar:bzip2
  - Add INSTALL_TARGET=install-strip
  - Don't patch Makefile.am and configure.in to avoid autotools

Modified:
  head/net-p2p/dclib/Makefile
  head/net-p2p/dclib/pkg-plist

Modified: head/net-p2p/dclib/Makefile
==============================================================================
--- head/net-p2p/dclib/Makefile	Tue Jul  8 18:56:33 2014	(r361277)
+++ head/net-p2p/dclib/Makefile	Tue Jul  8 19:00:02 2014	(r361278)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dclib
 PORTVERSION=	0.3.23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/wxdcgui/${PORTNAME}/${PORTVERSION}
 
@@ -14,31 +14,26 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 1000015
 EXTRA_PATCHES=	${FILESDIR}/extra-dclib-core_cssl.cpp
 .endif
 
-post-extract:
-	${CHMOD} 0755 ${WRKSRC}/admin/install-sh
-
 post-patch:
-#	${REINPLACE_CMD} -e 's|-O2 ||g; s/-pedantic //g' \
-#		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-	    ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
-	${FIND} ${WRKSRC} -name "Makefile.*" | ${XARGS} \
+	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
 	    ${REINPLACE_CMD} -e 's|dclib-0.3/||g'
 	${REINPLACE_CMD} -e 's|-0.3||g' ${WRKSRC}/dclib.pc.in
 	${REINPLACE_CMD} -e 's|-D_XOPEN_SOURCE=500||g; \
-	    s|-D_BSD_SOURCE||g' ${WRKSRC}/configure ${WRKSRC}/configure.in
+	    s|-D_BSD_SOURCE||g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/net-p2p/dclib/pkg-plist
==============================================================================
--- head/net-p2p/dclib/pkg-plist	Tue Jul  8 18:56:33 2014	(r361277)
+++ head/net-p2p/dclib/pkg-plist	Tue Jul  8 19:00:02 2014	(r361278)
@@ -58,9 +58,9 @@ include/dclib/dclib-stl-use.h
 include/dclib/dclib.h
 include/dclib/dcobject.h
 include/dclib/dcos.h
-lib/libdc.la
 lib/libdc.so
 lib/libdc.so.5
+lib/libdc.so.5.0.0
 @dirrmtry lib/dclib/plugin
 @dirrmtry lib/dclib
 libdata/pkgconfig/dclib.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407081900.s68J022v032342>