Use INSTALLATION_DIRS

7 files changed, 15 insertions, 25 deletions

diff --git a/databases/jdbc-postgresql81/Makefile b/databases/jdbc-postgresql81/Makefile
index b9179835f1c..bd31022d036 100644
--- a/databases/jdbc-postgresql81/Makefile
+++ b/databases/jdbc-postgresql81/Makefile
@@ -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 @@ JARFILE=		postgresql81.jar
 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+=		EXAMPLEDIR=${EXAMPLEDIR:Q}
 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 --git a/databases/jdbc-postgresql82/Makefile b/databases/jdbc-postgresql82/Makefile
index c328b00218b..dd34a592b31 100644
--- a/databases/jdbc-postgresql82/Makefile
+++ b/databases/jdbc-postgresql82/Makefile
@@ -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 @@ JARFILE=		postgresql82.jar
 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+=		JARFILE=${JARFILE:Q}
 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 --git a/databases/jdbc-postgresql83/Makefile b/databases/jdbc-postgresql83/Makefile
index 5c2e6a5a784..d1962b307a0 100644
--- a/databases/jdbc-postgresql83/Makefile
+++ b/databases/jdbc-postgresql83/Makefile
@@ -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 @@ JARFILE=		postgresql83.jar
 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+=		JARFILE=${JARFILE:Q}
 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 --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile
index 8be217edca3..dc0e2fc9b8b 100644
--- a/games/civctp-demo/Makefile
+++ b/games/civctp-demo/Makefile
@@ -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_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	x11
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS=	${LIBDIR} ${SHAREDIR}
 
 USE_TOOLS+=	pax
 
@@ -47,8 +48,6 @@ do-build:
 
 # 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 --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile
index 68c2bc18de6..b57124bd677 100644
--- a/games/eus-demo/Makefile
+++ b/games/eus-demo/Makefile
@@ -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.powerpc=	ppc/glibc-2.1
 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 @@ do-build:
 
 # 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 --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 353a79ede71..5a6390d906b 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -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 @@ DIST_SUBDIR=	lokigames
 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 @@ do-build:
 
 # 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 --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 776a065b07c..ede1faa804a 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -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 @@ INTERPRETER_SUPPORT=	YES
 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 @@ pre-configure: perl5-configure
 
 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}