Re: Packages without DESTDIR support

[Steven Drake <sdrake%xnet.co.nz@localhost>]

On Mon, 28 Dec 2009, Joerg Sonnenberger wrote:
> > http://www.netbsd.org/~joerg/missing-destdir
> 
> Down to 1073!

Heres a small contribution, and did you pickup the procmail fix I sent 
last week?

-- 
Steven
UNIX is basically a simple operating system,
but you have to be a genius to understand the simplicity  --- dmr

Index: comms/jpilot/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/jpilot/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- comms/jpilot/Makefile       26 Aug 2009 19:57:00 -0000      1.66
+++ comms/jpilot/Makefile       19 Dec 2009 10:37:41 -0000
@@ -10,6 +10,8 @@ MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.jpilot.org/
 COMMENT=               Desktop organizer application for the palm pilot
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=            jpilot-libplugin-[0-9]*
 
 USE_LIBTOOL=           YES
@@ -37,12 +39,12 @@ post-extract:
        ${RM} -f ${WRKSRC}/po/Makefile.in
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA_DIR} ${INCDIR}
-       ${INSTALL_DATA_DIR} ${PLUGINSDIR}
-       cd ${WRKSRC}; ${INSTALL_DATA} libplugin.h prefs.h ${INCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/BUGS ${DOCDIR}
-       cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR}
-       ${TOUCH} ${PLUGINSDIR}/.directory
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${INCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PLUGINSDIR}
+       cd ${WRKSRC}; ${INSTALL_DATA} libplugin.h prefs.h ${DESTDIR}${INCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${DOCDIR}
+       cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${DESTDIR}${MAN1DIR}
+       ${TOUCH} ${DESTDIR}${PLUGINSDIR}/.directory
 
 .include "../../mk/bsd.pkg.mk"
Index: devel/splint/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/splint/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/splint/Makefile       3 Mar 2009 08:58:23 -0000       1.14
+++ devel/splint/Makefile       19 Dec 2009 10:37:41 -0000
@@ -11,10 +11,12 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://lclint.cs.virginia.edu/
 COMMENT=       Statically check C programs
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    gmake lex
 GNU_CONFIGURE= YES
 
 post-install:
-       ${INSTALL_MAN} ${WRKSRC}/doc/splint.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/doc/splint.1 
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: editors/ed/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/ed/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- editors/ed/Makefile 4 Nov 2008 14:27:37 -0000       1.11
+++ editors/ed/Makefile 19 Dec 2009 10:37:41 -0000
@@ -9,6 +9,8 @@ MAINTAINER=             reed%reedmedia.net@localhost
 HOMEPAGE=              http://www.gnu.org/software/ed/ed.html
 COMMENT=               GNU version of line-oriented text editor
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
 
 .include "../../mk/bsd.prefs.mk"
@@ -22,6 +24,6 @@ PLIST_SUBST+=         GNU_PROGRAM_PREFIX=${GNU_
 BUILD_DEFS+=           GNU_PROGRAM_PREFIX
 
 post-install:
-       cd ${WRKSRC} && ${MAKE} install-man
+       cd ${WRKSRC} && ${MAKE} ${INSTALL_MAKE_FLAGS} install-man 
 
 .include "../../mk/bsd.pkg.mk"
Index: security/ssh-askpass/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/ssh-askpass/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- security/ssh-askpass/Makefile       27 Dec 2006 13:37:39 -0000      1.11
+++ security/ssh-askpass/Makefile       19 Dec 2009 10:37:41 -0000
@@ -10,12 +10,14 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.jmknoble.net/software/x11-ssh-askpass/
 COMMENT=       X11-based passphrase dialog for OpenSSH
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_IMAKE=     yes
 INSTALL_TARGET=        install
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ssh-askpass
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ssh-askpass
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ssh-askpass
+       ${INSTALL_DATA} ${WRKSRC}/README 
${DESTDIR}${PREFIX}/share/doc/ssh-askpass
 
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: sysutils/cpuid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/cpuid/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- sysutils/cpuid/Makefile     9 May 2007 11:57:27 -0000       1.6
+++ sysutils/cpuid/Makefile     19 Dec 2009 10:37:41 -0000
@@ -8,6 +8,8 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      
http://directory.fsf.org/System_administration/Configuration/cpuid.html
 COMMENT=       CPU identification feature
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 ONLY_FOR_PLATFORM=     *-*-i386
 ONLY_FOR_PLATFORM+=    *-*-x86_64
 
@@ -17,6 +19,6 @@ do-build:
        cd ${WRKSRC} && ${CC} ${CFLAGS} cpuid.c -o cpuid
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/cpuid ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/cpuid ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
Index: print/xpp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/xpp/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- print/xpp/Makefile  26 Aug 2009 19:58:15 -0000      1.38
+++ print/xpp/Makefile  20 Dec 2009 00:45:47 -0000
@@ -9,6 +9,8 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://cups.sourceforge.net/xpp/index.html
 COMMENT=       X Printing Panel
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    gmake
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
@@ -19,7 +21,7 @@ DOCDIR=               ${PREFIX}/share/doc/xpp
 .include "../../x11/fltk/buildlink3.mk"
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
Index: print/html2ps/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/html2ps/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- print/html2ps/Makefile      8 Mar 2009 19:17:10 -0000       1.26
+++ print/html2ps/Makefile      20 Dec 2009 08:54:47 -0000
@@ -10,6 +10,8 @@ MAINTAINER=   kim%tac.nyc.ny.us@localhost
 HOMEPAGE=      http://user.it.uu.se/~jan/html2ps.html
 COMMENT=       HTML to PostScript converter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=      ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 DEPENDS+=      jpeg>=6b:../../graphics/jpeg
@@ -25,8 +27,8 @@ NO_CONFIGURE= yes
 NO_BUILD=      yes
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/html2ps
-       @cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install ${PREFIX}
-       @${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/share/html2ps/sample.rc
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/html2ps
+       @cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install 
${DESTDIR}${PREFIX}
+       @${INSTALL_DATA} ${WRKSRC}/sample 
${DESTDIR}${PREFIX}/share/html2ps/sample.rc
 
 .include "../../mk/bsd.pkg.mk"