pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/port2pkg Don't install corrupted catpages on ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/20ea0f3aad44
branches:  trunk
changeset: 535437:20ea0f3aad44
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 17 16:00:20 2007 +0000

description:
Don't install corrupted catpages on Solaris and AIX. PKGREVISION++

Cleaned up the Makefile.

diffstat:

 pkgtools/port2pkg/Makefile |  33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 deletions(-)

diffs (55 lines):

diff -r 005da0822e7c -r 20ea0f3aad44 pkgtools/port2pkg/Makefile
--- a/pkgtools/port2pkg/Makefile        Sat Nov 17 15:56:06 2007 +0000
+++ b/pkgtools/port2pkg/Makefile        Sat Nov 17 16:00:20 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/11/17 16:00:20 rillig Exp $
 #
 
 DISTNAME=      port2pkg-1.11
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -13,29 +13,22 @@
 DEPENDS+=      pkglint-[0-9]*:../../pkgtools/pkglint
 
 WRKSRC=                ${WRKDIR}
-
-EXTRACT_ONLY=  # empty
 NO_CHECKSUM=   yes
-NO_CONFIGURE=  yes
+NO_BUILD=      yes
 USE_TOOLS+=    gtar perl:run
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+INSTALLATION_DIRS_FROM_PLIST=  yes
 
-do-build:
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
-       # the pre-generated man-pages are 'mandoc';  these OS need 'man'
-       nroff -man ${FILESDIR}/port2pkg.1 >${WRKSRC}/port2pkg.0
-.else
-       ${CP} ${FILESDIR}/port2pkg.0 ${WRKSRC}/port2pkg.0
-.endif
-       ${SED} -e 's|$${GTAR}|${GTAR}|g' ${FILESDIR}/port2pkg.pl \
-               > ${WRKSRC}/port2pkg
+do-extract:
+       cd ${FILESDIR} && cp port2pkg.* ${WRKSRC}
+
+SUBST_CLASSES+=                gtar
+SUBST_STAGE.gtar=      pre-configure
+SUBST_FILES.gtar=      port2pkg.pl
+SUBST_SED.gtar=                -e 's|$${GTAR}|${GTAR}|g'
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/port2pkg ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/port2pkg.pl ${PREFIX}/bin/port2pkg
        ${INSTALL_MAN} ${WRKSRC}/port2pkg.0 ${PREFIX}/${PKGMANDIR}/cat1
-       ${INSTALL_MAN} ${FILESDIR}/port2pkg.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/port2pkg.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index