pkg/38521: DESTDIR support and clean-ups for pkgtools/shlock

[cheusov%tut.by@localhost]

>Number:         38521
>Category:       pkg
>Synopsis:       DESTDIR support for pkgtools/shlock
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 27 08:50:00 +0000 2008
>Originator:     cheusov%tut.by@localhost
>Release:        NetBSD 4.0_STABLE
>Organization:
>Environment:
System: NetBSD chen.chizhovka.net 4.0_STABLE NetBSD 4.0_STABLE (GENERIC) #3: 
Wed Apr 23 00:58:08 EEST 2008 
cheusov%chen.chizhovka.net@localhost:/srv/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
http://www.mova.org/~cheusov/pub/pkgsrc-pbulk/NetBSD/current-destdir/log/20080426.0859/pkgtools/shlock/stage_package.html

=> Generating pre-install file lists
#   install  
/tmp/obj-pkgsrc-destdir/pkgtools/shlock/work/.destdir/usr/pkg/bin/shlock
install  -c  -r -o root -g wheel -m 755  -s shlock 
/tmp/obj-pkgsrc-destdir/pkgtools/shlock/work/.destdir/usr/pkg/bin/shlock
install: /tmp/obj-pkgsrc-destdir/pkgtools/shlock/work/.destdir/usr/pkg/bin: 
mkstemp: No such file or directory
*** Error code 1

Stop.
make: stopped in /tmp/obj-pkgsrc-destdir/pkgtools/shlock/work
*** Error code 1

Stop.
make: stopped in /srv/pkgsrc/pkgtools/shlock
*** Error code 1

>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/shlock/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile    19 Dec 2006 13:28:20 -0000      1.18
+++ Makefile    27 Apr 2008 08:43:40 -0000
@@ -13,35 +13,17 @@
 WRKSRC=                ${WRKDIR}
 EXTRACT_ONLY=  #empty
 NO_CHECKSUM=   yes
-MANCOMPRESSED_IF_MANZ= yes
-PLIST_SRC=     ${WRKDIR}/PLIST
-BUILD_DEFS+=   MANINSTALL
 
-MAKE_ENV+=     ${BSD_MAKE_ENV}
+WRKSRC=                        ${.CURDIR}/files
 
-.include "../../mk/bsd.prefs.mk"
+USE_BSD_MAKEFILE=      yes
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+MAKE_ENV+=             MAKEOBJDIR=${WRKDIR}
+MAKE_ENV+=             MKCATPAGES=no
 
 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:
-       @for FILE in Makefile shlock.c shlock.1; do                     \
-               ${CP} ${FILESDIR}/$$FILE ${WRKSRC};                     \
-       done
-
-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
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/shlock/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST       15 Jan 2002 13:20:27 -0000      1.1.1.1
+++ PLIST       27 Apr 2008 08:43:40 -0000
@@ -1,2 +1,3 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2002/01/15 13:20:27 agc Exp $
 bin/shlock
+man/man1/shlock.1