Date: Thu, 23 Jun 2016 07:09:57 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417348 - in head: archivers/bzip2 archivers/libarc astro/google-earth audio/gvolwheel audio/pd cad/brickutils cad/leocad cad/meshlab cad/qcad comms/tkscanfax Message-ID: <201606230709.u5N79vK2018185@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Jun 23 07:09:57 2016 New Revision: 417348 URL: https://svnweb.freebsd.org/changeset/ports/417348 Log: Prefer relative links to make packages more relocation friendly Modified: head/archivers/bzip2/Makefile head/archivers/libarc/Makefile head/astro/google-earth/Makefile head/audio/gvolwheel/Makefile head/audio/pd/Makefile head/cad/brickutils/Makefile head/cad/leocad/Makefile head/cad/meshlab/Makefile head/cad/qcad/Makefile head/comms/tkscanfax/Makefile Modified: head/archivers/bzip2/Makefile ============================================================================== --- head/archivers/bzip2/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/archivers/bzip2/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,6 +3,7 @@ PORTNAME= bzip2 PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://www.bzip.org/${PORTVERSION}/ @@ -18,19 +19,19 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/bzip2 ${STAGEDIR}${PREFIX}/bin/bunzip2 - ${LN} -sf ${PREFIX}/bin/bzip2 ${STAGEDIR}${PREFIX}/bin/bzcat - ${LN} -sf ${PREFIX}/bin/bzip2 ${STAGEDIR}${PREFIX}/bin/bz2cat + ${LN} -sf bzip2 ${STAGEDIR}${PREFIX}/bin/bunzip2 + ${LN} -sf bzip2 ${STAGEDIR}${PREFIX}/bin/bzcat + ${LN} -sf bzip2 ${STAGEDIR}${PREFIX}/bin/bz2cat ${INSTALL_PROGRAM} ${WRKSRC}/bzip2recover ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bzgrep ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/bzgrep ${STAGEDIR}${PREFIX}/bin/bzegrep - ${LN} -sf ${PREFIX}/bin/bzgrep ${STAGEDIR}${PREFIX}/bin/bzfgrep + ${LN} -sf bzgrep ${STAGEDIR}${PREFIX}/bin/bzegrep + ${LN} -sf bzgrep ${STAGEDIR}${PREFIX}/bin/bzfgrep ${INSTALL_SCRIPT} ${WRKSRC}/bzmore ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/bzmore ${STAGEDIR}${PREFIX}/bin/bzless + ${LN} -sf bzmore ${STAGEDIR}${PREFIX}/bin/bzless ${INSTALL_DATA} ${WRKSRC}/bzlib.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/libbz2.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libbz2.so.1 ${STAGEDIR}${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/libbz2.so.1 ${STAGEDIR}${PREFIX}/lib/libbz2.so + ${LN} -sf libbz2.so.1 ${STAGEDIR}${PREFIX}/lib/libbz2.so ${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/bzgrep.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/bzmore.1 ${STAGEDIR}${PREFIX}/man/man1 Modified: head/archivers/libarc/Makefile ============================================================================== --- head/archivers/libarc/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/archivers/libarc/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,7 +3,7 @@ PORTNAME= libarc PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers devel MASTER_SITES= http://www.onicos.com/staff/iz/release/ @@ -20,7 +20,7 @@ USE_LDCONFIG= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/arccat ${STAGEDIR}/${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/${SOLIB}.${SOVERSION} ${STAGEDIR}/${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/${SOLIB}.${SOVERSION} ${STAGEDIR}/${PREFIX}/lib/${SOLIB} + ${LN} -sf ${SOLIB}.${SOVERSION} ${STAGEDIR}/${PREFIX}/lib/${SOLIB} @${MKDIR} ${STAGEDIR}/${PREFIX}/include/libarc ${INSTALL_DATA} ${WRKSRC}/libarc/* ${STAGEDIR}/${PREFIX}/include/libarc (cd ${WRKSRC} && ${INSTALL_DATA} unlzh.h zip.h ${STAGEDIR}/${PREFIX}/include/libarc) Modified: head/astro/google-earth/Makefile ============================================================================== --- head/astro/google-earth/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/astro/google-earth/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -2,7 +2,7 @@ PORTNAME= google-earth PORTVERSION= 6.0.3.2197 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= astro deskutils geography MASTER_SITES= http://dl.google.com/earth/client/advanced/previous/:previous \ @@ -75,7 +75,7 @@ do-install: ${STAGEDIR}${DATADIR}/googleearth.desktop ${INSTALL_SCRIPT} ${FILESDIR}/browserwrapper \ ${STAGEDIR}${DATADIR}/bin/ - ${LN} -sf ${DATADIR}/bin/googleearth \ + ${LN} -sf ../${DATADIR_REL}/bin/googleearth \ ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/audio/gvolwheel/Makefile ============================================================================== --- head/audio/gvolwheel/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/audio/gvolwheel/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,7 +3,7 @@ PORTNAME= gvolwheel PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME} @@ -39,6 +39,6 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${LN} -sf ${PREFIX}/share/pixmaps/gvolwheel/audio-volume-high.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + ${LN} -sf gvolwheel/audio-volume-high.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .include <bsd.port.mk> Modified: head/audio/pd/Makefile ============================================================================== --- head/audio/pd/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/audio/pd/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -4,7 +4,7 @@ PORTNAME= pd DISTVERSION= 0.47-0 DISTVERSIONSUFFIX= .src -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://msp.ucsd.edu/Software/ @@ -79,7 +79,7 @@ do-install: .for i in LICENSE.txt README.txt (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor - ${LN} -sf ${DOCSDIR} ${STAGEDIR}${PREFIX}/lib/pd/doc + ${LN} -sf ../../${DOCSDIR_REL} ${STAGEDIR}${PREFIX}/lib/pd/doc ${FIND} ${STAGEDIR}${PREFIX}/lib/pd -name "*.pd_linux" | ${XARGS} \ ${STRIP_CMD} Modified: head/cad/brickutils/Makefile ============================================================================== --- head/cad/brickutils/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/cad/brickutils/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,7 +3,7 @@ PORTNAME= brickutils PORTVERSION= 0.1.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-obsolete/ \ SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-obsolete/:docs \ @@ -69,7 +69,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${LN} -sf ../icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ do-install-DOCS-on: Modified: head/cad/leocad/Makefile ============================================================================== --- head/cad/leocad/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/cad/leocad/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,7 +3,7 @@ PORTNAME= leocad PORTVERSION= 0.80.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/ DISTFILES= LeoCAD-Source-${PORTVERSION}.tgz @@ -86,7 +86,7 @@ post-install: @cd ${WRKSRC}/tools/icon && ${INSTALL_DATA} ${i} \ ${STAGEDIR}${DATADIR} .endfor - @${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + @${LN} -sf ../icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_MAN} ${WRKSRC}/docs/leocad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ Modified: head/cad/meshlab/Makefile ============================================================================== --- head/cad/meshlab/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/cad/meshlab/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,7 +3,7 @@ PORTNAME= meshlab PORTVERSION= 1.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MeshLab%20v${PORTVERSION}/ DISTNAME= MeshLabSrc_AllInc_v${PORTVERSION:C|\.||g} @@ -52,6 +52,6 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/shaders cd ${WRKSRC}/distrib/shaders && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/meshlab/shaders ${INSTALL_PROGRAM} ${WRKSRC}/distrib/meshlab ${STAGEDIR}${PREFIX}/lib/meshlab - ${LN} -sf ${PREFIX}/lib/meshlab/meshlab ${STAGEDIR}${PREFIX}/bin + ${LN} -sf ../lib/meshlab/meshlab ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/cad/qcad/Makefile ============================================================================== --- head/cad/qcad/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/cad/qcad/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -4,7 +4,7 @@ PORTNAME= qcad PORTVERSION= 3.15.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} @@ -62,10 +62,10 @@ pre-configure: do-install: ${INSTALL_PROGRAM} ${RESDIR}/qcad-bin ${STAGEDIR}${PREFIX}/bin/ - ${LN} -sf ${PREFIX}/bin/qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad + ${LN} -sf qcad-bin ${STAGEDIR}${PREFIX}/bin/qcad .for lib in ${SHRLIBS:C|^|lib|:C|$|.so|} ${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/${lib}.0 - ${LN} -sf ${PREFIX}/lib/${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib} + ${LN} -sf lib/${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib} .endfor .for lib in ${STALIBS:C|^|lib|:C|$|.a|} ${INSTALL_DATA} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/ Modified: head/comms/tkscanfax/Makefile ============================================================================== --- head/comms/tkscanfax/Makefile Thu Jun 23 06:47:40 2016 (r417347) +++ head/comms/tkscanfax/Makefile Thu Jun 23 07:09:57 2016 (r417348) @@ -3,7 +3,7 @@ PORTNAME= tkscanfax PORTVERSION= 1.1.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= comms tk MASTER_SITES= http://shino.pos.to/linux/tkscanfax/ @@ -16,20 +16,20 @@ WRKSRC= ${WRKDIR}/${PORTNAME}1 NO_BUILD= yes USES+= tk:wrapper -PLIST_SUB= TKSCANFAXDIR="${TKSCANFAXDIR:S,^${PREFIX}/,,}" +PLIST_SUB= TKSCANFAXDIR="${TKSCANFAXDIR}" -TKSCANFAXDIR= ${PREFIX}/lib/tkscanfax1 +TKSCANFAXDIR= lib/tkscanfax1 post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e \ 's|/usr/local/lib|${PREFIX}/lib|g' do-install: - @${MKDIR} ${STAGEDIR}${TKSCANFAXDIR} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TKSCANFAXDIR}) + @${MKDIR} ${STAGEDIR}${PREFIX}${TKSCANFAXDIR} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}${TKSCANFAXDIR}) .for file in tkfax tkscan - ${CHMOD} ${BINMODE} ${STAGEDIR}${TKSCANFAXDIR}/${file} - ${LN} -sf ${TKSCANFAXDIR}/${file} ${STAGEDIR}${PREFIX}/bin + ${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}${TKSCANFAXDIR}/${file} + ${LN} -sf ../${TKSCANFAXDIR}/${file} ${STAGEDIR}${PREFIX}/bin .endfor .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606230709.u5N79vK2018185>