diff options
| author | tnn <tnn> | 2008-05-29 17:03:54 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2008-05-29 17:03:54 +0000 |
| commit | d370dddfeb91f2b285f091b36d2baad8e5fa8bb8 (patch) | |
| tree | 110a87646b0e9c1bca6a60227beb56a166ab7428 /pkgtools | |
| parent | bb1d448f06d1a562d32638936e420cc4891030fc (diff) | |
| download | pkgsrc-d370dddfeb91f2b285f091b36d2baad8e5fa8bb8.tar.gz | |
Merge some changes from PR pkg/38521 to clean up the package and
desupport installing catpage.
Thanks to cheusov for the PR and obache for making me aware of it.
Bump the version to 20080529.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/shlock/Makefile | 33 | ||||
| -rw-r--r-- | pkgtools/shlock/PLIST | 3 |
2 files changed, 7 insertions, 29 deletions
diff --git a/pkgtools/shlock/Makefile b/pkgtools/shlock/Makefile index cc2d6762ea8..04a0df1b818 100644 --- a/pkgtools/shlock/Makefile +++ b/pkgtools/shlock/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2008/05/29 16:33:10 tnn Exp $ +# $NetBSD: Makefile,v 1.20 2008/05/29 17:03:54 tnn Exp $ # -DISTNAME= shlock-20020114 +DISTNAME= shlock-20080529 CATEGORIES= pkgtools sysutils MASTER_SITES= # empty DISTFILES= # empty @@ -11,38 +11,15 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Shell utility to perform dot-locking PKG_DESTDIR_SUPPORT= user-destdir +USE_BSD_MAKEFILE= yes +MAKE_ENV+= MKCATPAGES=no -EXTRACT_ONLY= #empty NO_CHECKSUM= yes -MANCOMPRESSED_IF_MANZ= yes -PLIST_SRC= ${WRKDIR}/PLIST -BUILD_DEFS+= MANINSTALL - -MAKE_ENV+= ${BSD_MAKE_ENV} INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1 - -.include "../../mk/bsd.prefs.mk" - PKGSRC_LOCKTYPE= none # avoid "bootstrapping problem" -.if !empty(OPSYS:MSunOS) || !empty(OPSYS:MDarwin) || \ - !empty(OPSYS:MDragonFly) || !empty(OPSYS:MFreeBSD) || \ - !empty(OPSYS:MLinux) -MANINSTALL= -.endif - -post-extract: +do-extract: ${CP} -R ${FILESDIR} ${WRKSRC} -pre-install: - @${RM} -f ${PLIST_SRC} - @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - @if [ -n "${MANINSTALL:Mcatinstall}" ]; then \ - ${ECHO} man/cat1/shlock.0 >> ${PLIST_SRC}; \ - fi - @if [ -n "${MANINSTALL:Mmaninstall}" ]; then \ - ${ECHO} man/man1/shlock.1 >> ${PLIST_SRC}; \ - fi - .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/shlock/PLIST b/pkgtools/shlock/PLIST index 47c6ed31acf..d535eab203b 100644 --- a/pkgtools/shlock/PLIST +++ b/pkgtools/shlock/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/15 13:20:27 agc Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/05/29 17:03:54 tnn Exp $ bin/shlock +man/man1/shlock.1 |