[pkgsrc/trunk]: pkgsrc Use INSTALLATION_DIRS

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a2b4aa2b29d
branches:  trunk
changeset: 554696:6a2b4aa2b29d
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Feb 18 10:56:09 2009 +0000

description:
Use INSTALLATION_DIRS

diffstat:

 databases/jdbc-postgresql81/Makefile |  6 ++----
 databases/jdbc-postgresql82/Makefile |  5 ++---
 databases/jdbc-postgresql83/Makefile |  5 ++---
 games/civctp-demo/Makefile           |  5 ++---
 games/eus-demo/Makefile              |  6 ++----
 games/heretic2-demo/Makefile         |  6 ++----
 mail/spamassassin/Makefile           |  7 +++----
 7 files changed, 15 insertions(+), 25 deletions(-)

diffs (195 lines):

diff -r 8499bdb43a0c -r 6a2b4aa2b29d databases/jdbc-postgresql81/Makefile
--- a/databases/jdbc-postgresql81/Makefile      Wed Feb 18 10:51:40 2009 +0000
+++ b/databases/jdbc-postgresql81/Makefile      Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/07/16 20:54:50 abs Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/18 10:56:09 abs Exp $
 #
 
 DISTNAME=              postgresql-jdbc-8.1-${PGBUILD}.src
@@ -17,6 +17,7 @@
 EXTRACT_ONLY=          ${DISTFILES:N*.jar}
 
 PKG_DESTDIR_SUPPORT=   user-destdir
+INSTALLATION_DIRS=     lib/java ${EXAMPLEDIR} ${DOCDIR}
 
 USE_JAVA=              run
 USE_JAVA2=             1.4
@@ -29,13 +30,10 @@
 PLIST_SUBST+=          DOCDIR=${DOCDIR:Q}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
        ${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
                ${DESTDIR}${PREFIX}/lib/java/${JARFILE}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
        ${INSTALL_DATA} ${WRKSRC}/example/*.java \
                ${DESTDIR}${PREFIX}/${EXAMPLEDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/java-vm.mk"
diff -r 8499bdb43a0c -r 6a2b4aa2b29d databases/jdbc-postgresql82/Makefile
--- a/databases/jdbc-postgresql82/Makefile      Wed Feb 18 10:51:40 2009 +0000
+++ b/databases/jdbc-postgresql82/Makefile      Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/07/16 20:56:00 abs Exp $
+# $NetBSD: Makefile,v 1.5 2009/02/18 10:56:09 abs Exp $
 #
 
 DISTNAME=              postgresql-jdbc-8.2-${PGBUILD}.src
@@ -17,6 +17,7 @@
 EXTRACT_ONLY=           ${DISTFILES:N*.jar}
 
 PKG_DESTDIR_SUPPORT=   user-destdir
+INSTALLATION_DIRS=     lib/java ${DOCDIR}
 
 USE_JAVA=              run
 USE_JAVA2=             1.4
@@ -27,10 +28,8 @@
 PLIST_SUBST+=          DOCDIR=${DOCDIR:Q}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
        ${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
                ${DESTDIR}${PREFIX}/lib/java/${JARFILE}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/java-vm.mk"
diff -r 8499bdb43a0c -r 6a2b4aa2b29d databases/jdbc-postgresql83/Makefile
--- a/databases/jdbc-postgresql83/Makefile      Wed Feb 18 10:51:40 2009 +0000
+++ b/databases/jdbc-postgresql83/Makefile      Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/16 20:49:30 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/02/18 10:56:09 abs Exp $
 #
 
 DISTNAME=              postgresql-jdbc-8.3-${PGBUILD}.src
@@ -17,6 +17,7 @@
 EXTRACT_ONLY=           ${DISTFILES:N*.jar}
 
 PKG_DESTDIR_SUPPORT=   user-destdir
+INSTALLATION_DIRS=     lib/java ${DOCDIR}
 
 USE_JAVA=              run
 USE_JAVA2=             1.4
@@ -27,10 +28,8 @@
 PLIST_SUBST+=          DOCDIR=${DOCDIR:Q}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/java
        ${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
                ${DESTDIR}${PREFIX}/lib/java/${JARFILE}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/java-vm.mk"
diff -r 8499bdb43a0c -r 6a2b4aa2b29d games/civctp-demo/Makefile
--- a/games/civctp-demo/Makefile        Wed Feb 18 10:51:40 2009 +0000
+++ b/games/civctp-demo/Makefile        Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:19 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/02/18 10:56:55 abs Exp $
 
 DISTNAME=      civctp-demo-10251999
 PKGNAME=       civctp-demo-19991025
@@ -17,6 +17,7 @@
 EMUL_MODULES.linux=    x11
 
 PKG_DESTDIR_SUPPORT=   user-destdir
+INSTALLATION_DIRS=     ${LIBDIR} ${SHAREDIR}
 
 USE_TOOLS+=    pax
 
@@ -47,8 +48,6 @@
 
 # The executable must be in the same directory as the data.
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
                ${DESTDIR}${PREFIX}/bin/${BINNAME}
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} \
diff -r 8499bdb43a0c -r 6a2b4aa2b29d games/eus-demo/Makefile
--- a/games/eus-demo/Makefile   Wed Feb 18 10:51:40 2009 +0000
+++ b/games/eus-demo/Makefile   Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:19 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/02/18 10:56:55 abs Exp $
 
 DISTNAME=      eus-demo
 PKGNAME=       eus-demo-1.0
@@ -37,7 +37,7 @@
 BINTYPE.sparc64=       sparc64/glibc-2.1
 BINTYPE=               ${BINTYPE.${EMUL_ARCH}}
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin ${LIBDIR} ${SHAREDIR}
 
 do-build:
        ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
@@ -47,8 +47,6 @@
 
 # The executable must be in the same directory as the data.
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
                ${DESTDIR}${PREFIX}/bin/${BINNAME}
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} \
diff -r 8499bdb43a0c -r 6a2b4aa2b29d games/heretic2-demo/Makefile
--- a/games/heretic2-demo/Makefile      Wed Feb 18 10:51:40 2009 +0000
+++ b/games/heretic2-demo/Makefile      Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:19 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/02/18 10:56:55 abs Exp $
 #
 
 DISTNAME=      heretic2-demo-x86
@@ -38,7 +38,7 @@
 LIBDIR=                ${PREFIX}/lib/lokigames/${BINNAME}
 SHAREDIR=      ${PREFIX}/share/doc/lokigames
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin ${LIBDIR} ${SHAREDIR}
 
 do-build:
        ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
@@ -48,8 +48,6 @@
 
 # The executable must be in the same directory as the data.
 do-install:
-       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${LIBDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh \
                ${DESTDIR}${PREFIX}/bin/${BINNAME}
        ${INSTALL_PROGRAM} ${WRKSRC}/${DISTBINNAME} \
diff -r 8499bdb43a0c -r 6a2b4aa2b29d mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Wed Feb 18 10:51:40 2009 +0000
+++ b/mail/spamassassin/Makefile        Wed Feb 18 10:56:09 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2008/11/14 22:51:52 joerg Exp $
+# $NetBSD: Makefile,v 1.91 2009/02/18 11:02:59 abs Exp $
 
 DISTNAME=      Mail-SpamAssassin-3.2.5
 PKGNAME=       spamassassin-3.2.5
@@ -140,6 +140,8 @@
 FILES_SUBST+=          INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q}
 FILES_SUBST+=          OPSYS=${OPSYS}
 
+INSTALLATION_DIRS+=    ${SA_INSTALLDIRS}
+
 pre-configure: perl5-configure
        # GNU configure needs version.h -> create it
        cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
@@ -148,9 +150,6 @@
 
 post-install:
        ${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
-.for dir in ${SA_INSTALLDIRS}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${dir}
-.endfor
 .for f in ${SA_DOCFILES}
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
        ${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}