Date: Sat, 9 May 2015 01:12:51 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385847 - in head: astro/swe chinese/autoconvert chinese/autoconvert/files devel/distorm devel/jsoncpp devel/libcxxrt devel/libgpkg devel/shapelib devel/shapelib/files lang/onyx mail/si... Message-ID: <201505090112.t491CpPK030568@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat May 9 01:12:50 2015 New Revision: 385847 URL: https://svnweb.freebsd.org/changeset/ports/385847 Log: - Don't install static libraries with INSTALL_LIB (part 2/2) Approved by: portmgr blanket MFH: 2015Q2 Modified: head/astro/swe/Makefile head/chinese/autoconvert/Makefile head/chinese/autoconvert/files/patch-Makefile head/devel/distorm/Makefile head/devel/jsoncpp/Makefile head/devel/libcxxrt/Makefile head/devel/libgpkg/Makefile head/devel/shapelib/Makefile head/devel/shapelib/files/patch-Makefile head/lang/onyx/Makefile head/mail/sid-milter/Makefile head/math/msieve/Makefile head/math/plplot-ada/Makefile head/math/plplot-ada/files/Makefile head/math/superlu_mt/Makefile head/security/axTLS/Makefile head/security/keynote/Makefile Modified: head/astro/swe/Makefile ============================================================================== --- head/astro/swe/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/astro/swe/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,6 +3,7 @@ PORTNAME= swe PORTVERSION= 2.01.00 +PORTREVISION= 1 CATEGORIES= astro devel MASTER_SITES= ftp://ftp.astro.com/pub/swisseph/ DISTNAME= ${PORTNAME}_unix_src_${PORTVERSION} @@ -21,7 +22,7 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS do-install: - ${INSTALL_LIB} ${WRKSRC}/libswe.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libswe.a ${STAGEDIR}${PREFIX}/lib ${MKDIR} ${STAGEDIR}${PREFIX}/include/swe ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/swe ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/chinese/autoconvert/Makefile ============================================================================== --- head/chinese/autoconvert/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/chinese/autoconvert/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= autoconvert PORTVERSION= 0.3.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= chinese MASTER_SITES= GOOGLE_CODE PROJECTHOST= libhz Modified: head/chinese/autoconvert/files/patch-Makefile ============================================================================== --- head/chinese/autoconvert/files/patch-Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/chinese/autoconvert/files/patch-Makefile Sat May 9 01:12:50 2015 (r385847) @@ -28,9 +28,9 @@ - install -m 644 include/*.h $(DESTDIR)/usr/include - ln -s autogb $(DESTDIR)/usr/bin/autob5 + ${BSD_INSTALL_PROGRAM} autogb $(DESTDIR)$(PREFIX)/bin -+ ${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib ++ ${BSD_INSTALL_LIB} lib/libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib + ln -sf libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib/libhz.so.0 + ln -sf libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib/libhz.so -+ ${BSD_INSTALL_LIB} lib/libhz.a $(DESTDIR)$(PREFIX)/lib ++ ${BSD_INSTALL_DATA} lib/libhz.a $(DESTDIR)$(PREFIX)/lib + ${BSD_INSTALL_DATA} include/*.h $(DESTDIR)$(PREFIX)/include + ln -sf autogb $(DESTDIR)$(PREFIX)/bin/autob5 Modified: head/devel/distorm/Makefile ============================================================================== --- head/devel/distorm/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/devel/distorm/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME?= distorm DISTVERSION= 20121220-r230 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= devel .if defined(PYTHON_SLAVEPORT) CATEGORIES+= python @@ -85,7 +85,7 @@ check regression-test test: build @cd ${BUILD_WRKSRC}; ./disasm disasm do-install: - @(cd ${BUILD_WRKSRC}; ${INSTALL_LIB} libdistorm3.a ${STAGEDIR}${PREFIX}/lib; \ + @(cd ${BUILD_WRKSRC}; ${INSTALL_DATA} libdistorm3.a ${STAGEDIR}${PREFIX}/lib; \ ${INSTALL_LIB} libdistorm3.so ${STAGEDIR}${PREFIX}/lib/libdistorm3.so.1; \ ${LN} -sf libdistorm3.so.1 ${STAGEDIR}${PREFIX}/lib/libdistorm3.so; \ ${INSTALL_PROGRAM} disasm ${STAGEDIR}${PREFIX}/bin) Modified: head/devel/jsoncpp/Makefile ============================================================================== --- head/devel/jsoncpp/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/devel/jsoncpp/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,6 +3,7 @@ PORTNAME= jsoncpp DISTVERSION= 0.6.0-rc2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/jsoncpp/${DISTVERSION} DISTNAME= jsoncpp-src-${DISTVERSION} @@ -21,7 +22,7 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp (cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/) (cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \ - ${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.a \ + ${INSTALL_DATA} libjson_linux-gcc-FreeBSD_libmt.a \ ${STAGEDIR}${PREFIX}/lib/libjsoncpp.a) (cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \ ${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.so \ Modified: head/devel/libcxxrt/Makefile ============================================================================== --- head/devel/libcxxrt/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/devel/libcxxrt/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -2,7 +2,7 @@ PORTNAME= libcxxrt PORTVERSION= 20131225 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org @@ -19,7 +19,7 @@ CXXFLAGS+= -nostdlib do-install: ${INSTALL_LIB} ${WRKSRC}/lib/libcxxrt.so ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/lib/libcxxrt.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/libcxxrt.a ${STAGEDIR}${PREFIX}/lib @${MKDIR} ${STAGEDIR}${PREFIX}/include/cxxrt ${INSTALL_DATA} ${WRKSRC}/src/*.h ${STAGEDIR}${PREFIX}/include/cxxrt Modified: head/devel/libgpkg/Makefile ============================================================================== --- head/devel/libgpkg/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/devel/libgpkg/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= libgpkg PORTVERSION= 0.9.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/luciad/libgpkg/get/ \ LOCAL/sunpoet/${PORTNAME} @@ -29,6 +29,6 @@ GEOS_CMAKE_ON= -DGPKG_GEOS=ON GEOS_LIB_DEPENDS= libgeos_c.so:${PORTSDIR}/graphics/geos post-install: - ${INSTALL_LIB} ${WRKSRC}/gpkg/libgpkg.a ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/gpkg/libgpkg.a ${STAGEDIR}${PREFIX}/lib/ .include <bsd.port.mk> Modified: head/devel/shapelib/Makefile ============================================================================== --- head/devel/shapelib/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/devel/shapelib/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= shapelib PORTVERSION= 1.3.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel geography MASTER_SITES= http://download.osgeo.org/shapelib/ \ ftp://ftp.remotesensing.org/shapelib/ \ Modified: head/devel/shapelib/files/patch-Makefile ============================================================================== --- head/devel/shapelib/files/patch-Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/devel/shapelib/files/patch-Makefile Sat May 9 01:12:50 2015 (r385847) @@ -24,7 +24,7 @@ shpopen.o: shpopen.c shapefil.h $(CC) $(CFLAGS) -c shpopen.c -@@ -98,16 +101,20 @@ +@@ -98,16 +101,21 @@ lib: libshp.a @@ -37,7 +37,8 @@ - cp libshp.a $(PREFIX)/lib - cp shapefil.h $(PREFIX)/include + $(BSD_INSTALL_DATA) shapefil.h $(DESTDIR)$(PREFIX)/include/ -+ $(BSD_INSTALL_LIB) libshp.a libshp.so.1 $(DESTDIR)$(PREFIX)/lib/ ++ $(BSD_INSTALL_DATA) libshp.a $(DESTDIR)$(PREFIX)/lib/ ++ $(BSD_INSTALL_LIB) libshp.so.1 $(DESTDIR)$(PREFIX)/lib/ bin_install: $(SHPBIN) - cp $(SHPBIN) $(PREFIX)/bin Modified: head/lang/onyx/Makefile ============================================================================== --- head/lang/onyx/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/lang/onyx/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= onyx PORTVERSION= 5.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= http://www.canonware.com/download/onyx/ @@ -40,7 +40,7 @@ do-install: ${LN} -sf bin/onyx_config ${STAGEDIR}${PREFIX}/bin/${PORTNAME}_config-${PORTVERSION} ${MKDIR} ${STAGEDIR}${PREFIX}/include/libonyx ${INSTALL_DATA} ${WRKSRC}/lib/libonyx/include/libonyx/*.h ${STAGEDIR}${PREFIX}/include/libonyx - ${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/libonyx/lib/libonyx.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.so.13 ${STAGEDIR}${PREFIX}/lib ${MKDIR} ${STAGEDIR}${DATADIR}/nx/modclopt Modified: head/mail/sid-milter/Makefile ============================================================================== --- head/mail/sid-milter/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/mail/sid-milter/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -2,6 +2,7 @@ PORTNAME= sid-milter PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION} @@ -63,7 +64,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man8/ .endfor .if ${PORT_OPTIONS:MLIBAR} - ${INSTALL_LIB} ${WRKSRC}/*/libar/libar.a ${STAGEDIR}${PREFIX}/lib/libar.a + ${INSTALL_DATA} ${WRKSRC}/*/libar/libar.a ${STAGEDIR}${PREFIX}/lib/libar.a ${INSTALL_DATA} ${WRKSRC}/libar/ar.h ${STAGEDIR}${PREFIX}/include/libar.h .for i in ${MAN3} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man3/ Modified: head/math/msieve/Makefile ============================================================================== --- head/math/msieve/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/math/msieve/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,6 +3,7 @@ PORTNAME= msieve PORTVERSION= 1.51 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF MASTER_SITE_SUBDIR= \ @@ -64,7 +65,7 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/msieve ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/include/msieve @cd ${WRKSRC}/include; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include/msieve - @${INSTALL_LIB} ${WRKSRC}/libmsieve.a ${STAGEDIR}${PREFIX}/lib + @${INSTALL_DATA} ${WRKSRC}/libmsieve.a ${STAGEDIR}${PREFIX}/lib .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} Modified: head/math/plplot-ada/Makefile ============================================================================== --- head/math/plplot-ada/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/math/plplot-ada/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= plplot PORTVERSION= ${RELEASE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source PKGNAMESUFFIX= -ada Modified: head/math/plplot-ada/files/Makefile ============================================================================== --- head/math/plplot-ada/files/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/math/plplot-ada/files/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -7,7 +7,7 @@ install: mkdir -p ${DESTDIR}${PREFIX}/lib/gnat \ ${DESTDIR}${PREFIX}/lib/plplotada \ ${DESTDIR}${PREFIX}/include/plplotada - ${BSD_INSTALL_LIB} ada/build/lib/libplplotada.a \ + ${BSD_INSTALL_DATA} ada/build/lib/libplplotada.a \ ${DESTDIR}${PREFIX}/lib/plplotada ${BSD_INSTALL_DATA} ada/build/lib/*.ali \ ${DESTDIR}${PREFIX}/lib/plplotada Modified: head/math/superlu_mt/Makefile ============================================================================== --- head/math/superlu_mt/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/math/superlu_mt/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= superlu_mt PORTVERSION= 2.0.20080115 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= math MASTER_SITES= http://crd.lbl.gov/~xiaoye/SuperLU/ \ http://crd.lbl.gov/~xiaoye/:doc @@ -104,7 +104,7 @@ do-build: done do-install: - ${INSTALL_LIB} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKDIR}/tmp_shared/libsuperlu_mt.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s -f libsuperlu_mt.so.${SVERSION} libsuperlu_mt.so ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} Modified: head/security/axTLS/Makefile ============================================================================== --- head/security/axTLS/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/security/axTLS/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= axTLS PORTVERSION= 1.4.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security devel net MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTVERSION} @@ -102,7 +102,7 @@ post-build: .endif do-install: - ${INSTALL_LIB} ${STAGE}/libaxtls.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${STAGE}/libaxtls.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${STAGE}/libaxtls.so.1.2 ${STAGEDIR}${PREFIX}/lib ${LN} -s libaxtls.so.1.2 ${STAGEDIR}${PREFIX}/lib/libaxtls.so.1 ${LN} -fs libaxtls.so.1 ${STAGEDIR}${PREFIX}/lib/libaxtls.so Modified: head/security/keynote/Makefile ============================================================================== --- head/security/keynote/Makefile Sat May 9 01:11:52 2015 (r385846) +++ head/security/keynote/Makefile Sat May 9 01:12:50 2015 (r385847) @@ -3,7 +3,7 @@ PORTNAME= keynote PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www1.cs.columbia.edu/~angelos/Code/ @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Trust-Management System LICENSE= MIT -LICENSE_FILE= ${WRKWRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake # required to support parallel (-jX) builds USE_OPENSSL= yes @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keynote ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/keynote.h ${STAGEDIR}${PREFIX}/include - ${INSTALL_LIB} ${WRKSRC}/libkeynote.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libkeynote.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/man/keynote.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/man/keynote.3 ${STAGEDIR}${MANPREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/man/keynote.4 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505090112.t491CpPK030568>