pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/cad/lc cad/lc: Remove cat page installation



details:   https://anonhg.NetBSD.org/pkgsrc/rev/849b2557d253
branches:  trunk
changeset: 604132:849b2557d253
user:      marino <marino%pkgsrc.org@localhost>
date:      Wed May 23 12:50:04 2012 +0000

description:
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.

diffstat:

 cad/lc/Makefile |  18 +++++++++++-------
 cad/lc/PLIST    |   4 +---
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 20198af579b2 -r 849b2557d253 cad/lc/Makefile
--- a/cad/lc/Makefile   Wed May 23 11:03:42 2012 +0000
+++ b/cad/lc/Makefile   Wed May 23 12:50:04 2012 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 20198af579b2 -r 849b2557d253 cad/lc/PLIST
--- a/cad/lc/PLIST      Wed May 23 11:03:42 2012 +0000
+++ b/cad/lc/PLIST      Wed May 23 12:50:04 2012 +0000
@@ -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/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



Home | Main Index | Thread Index | Old Index