diff options
author | marino <marino@pkgsrc.org> | 2012-05-23 12:50:04 +0000 |
---|---|---|
committer | marino <marino@pkgsrc.org> | 2012-05-23 12:50:04 +0000 |
commit | 3e73a2ebcce40714497bdc2539322032a9e2aacf (patch) | |
tree | cd71140c30a2e5ec15928b87fd7f6bc78a6f7515 | |
parent | 1ce50ee6bd2670c2ae63e4b0094ec0b6abb11018 (diff) | |
download | pkgsrc-3e73a2ebcce40714497bdc2539322032a9e2aacf.tar.gz |
cad/lc: Remove cat page installation
It seems like the document tarball is extracted twice, once into the
work directory and then again directly into the destdir. To prevent the
cat pages from installing, the man directory was removed after the
second extraction.
At the same time, the hardcoded variations of "lc2.10" were replaced by
a variable to ease future upgrades.
-rw-r--r-- | cad/lc/Makefile | 18 | ||||
-rw-r--r-- | cad/lc/PLIST | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/cad/lc/Makefile b/cad/lc/Makefile index a2fd9435145..333d6c0a084 100644 --- a/cad/lc/Makefile +++ b/cad/lc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2012/05/23 12:50:04 marino Exp $ DISTNAME= lc # overridden below -PKGNAME= lc-2.10 -PKGREVISION= 2 +PKGNAME= lc-${LCVER} +PKGREVISION= 3 CATEGORIES= cad MASTER_SITES= http://lc.cray.com/download/ @@ -19,8 +19,9 @@ NO_SRC_ON_FTP= ${RESTRICTED} PKG_DESTDIR_SUPPORT= destdir +LCVER= 2.10 DIST_SUBDIR= ${PKGNAME_NOREV} -WRKSRC= ${WRKDIR}/lc2.10 +WRKSRC= ${WRKDIR}/lc${LCVER} BUILD_DIRS= # empty EMUL_PLATFORMS= irix-mipsel irix-mipsel64 @@ -58,8 +59,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/lc ${DESTDIR}${PREFIX}/bin/lc ${INSTALL_PROGRAM} ${WRKSRC}/bin/lcplot ${DESTDIR}${PREFIX}/bin/lcplot if test -f ${WRKSRC}/bin/spice ; then ${INSTALL_PROGRAM} ${WRKSRC}/bin/spice ${DESTDIR}${PREFIX}/bin/lcspice ; fi - cd ${DESTDIR}${PREFIX}/share && ${TAR} -zxf ${DISTDIR}/${DIST_SUBDIR}/lc_doc.tar.gz - ${CHMOD} -R ugo+rX ${DESTDIR}${PREFIX}/share/lc2.10 - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/lc2.10 + # remove cat pages after extraction but before installation + cd ${DESTDIR}${PREFIX}/share && \ + ${TAR} -zxf ${DISTDIR}/${DIST_SUBDIR}/lc_doc.tar.gz && \ + ${RM} -rf lc${LCVER}/man + ${CHMOD} -R ugo+rX ${DESTDIR}${PREFIX}/share/lc${LCVER} + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/lc${LCVER} .include "../../mk/bsd.pkg.mk" diff --git a/cad/lc/PLIST b/cad/lc/PLIST index d17e257632f..4b05344739b 100644 --- a/cad/lc/PLIST +++ b/cad/lc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:35:54 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2012/05/23 12:50:04 marino Exp $ bin/lc bin/lcplot ${PLIST.lcspice}bin/lcspice @@ -8,8 +8,6 @@ share/lc2.10/app-defaults/Lcplot share/lc2.10/index.html share/lc2.10/install.html share/lc2.10/lc.gif -share/lc2.10/man/cat1/lc.1 -share/lc2.10/man/cat1/lcplot.1 share/lc2.10/models/README share/lc2.10/models/champ/README share/lc2.10/models/champ/champ.gif |