From cf4dfe44a59d7070d33288645a2fe86fa61a7c38 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 20 Aug 2005 19:16:21 +0000 Subject: Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} so that these directories will be conditionally removed (based on reference counts), regardless of the value of PKG_CONFIG. Bump the PKGREVISION for packages that were modified as a result. --- audio/xmcd/Makefile | 6 +++--- chat/ser/Makefile | 6 +++--- databases/gnats/Makefile | 7 ++++--- fonts/ghostscript-cidfonts/Makefile | 5 +++-- fonts/ghostscript-cmaps/Makefile | 5 +++-- games/d2x/Makefile | 6 +++--- games/nethack-lib/Makefile | 7 ++++--- lang/jdk/Makefile | 4 ++-- lang/kaffe/Makefile | 4 ++-- lang/sablevm-classpath-gui/Makefile | 4 ++-- lang/sablevm-classpath/Makefile | 4 ++-- lang/sablevm/Makefile | 4 ++-- lang/sun-jdk13/Makefile | 4 ++-- lang/sun-jdk14/Makefile | 4 ++-- lang/sun-jdk15/Makefile | 3 ++- lang/sun-jre13/Makefile | 4 ++-- lang/sun-jre14/Makefile | 4 ++-- lang/sun-jre15/Makefile | 3 ++- lang/win32-jdk/Makefile | 4 ++-- mail/cucipop/Makefile | 6 +++--- misc/XFree86-dirs/Makefile | 5 +++-- misc/gnome-dirs/Makefile | 5 +++-- misc/gnome1-dirs/Makefile | 5 +++-- misc/gnome2-dirs/Makefile | 5 +++-- misc/theme-dirs/Makefile | 5 +++-- misc/xdg-dirs/Makefile | 5 +++-- misc/xdg-x11-dirs/Makefile | 5 +++-- misc/xorg-dirs/Makefile | 5 +++-- mk/java-env.mk | 4 ++-- multimedia/gstreamer/Makefile | 5 +++-- net/netdisco/Makefile | 5 +++-- pkgtools/pkg_alternatives/Makefile | 7 ++++--- textproc/xmlcatmgr/Makefile | 5 +++-- www/apache/Makefile | 8 ++++---- www/websvn/Makefile | 6 +++--- x11/gtk2/Makefile | 5 +++-- x11/kdelibs3/Makefile | 5 +++-- x11/xfce4-desktop/Makefile | 6 +++--- x11/xfce4-panel/Makefile | 6 +++--- x11/xfce4-session/Makefile | 6 +++--- x11/xfce4-utils/Makefile | 6 +++--- 41 files changed, 114 insertions(+), 94 deletions(-) diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index 5a6011070a1..761209ef327 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2005/08/19 18:12:36 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/08/20 19:16:21 jlam Exp $ DISTNAME= xmcd-3.0.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= audio MASTER_SITES= http://www.ibiblio.org/tkan/download/xmcd/src/ @@ -38,7 +38,7 @@ CFILES= common.cfg device.cfg wwwwarp.cfg .for FILE in ${CFILES} CONF_FILES+= ${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE} .endfor -MAKE_DIRS= ${XMCDDIR} ${XMCDDIR}/cdinfo ${XMCDDIR}/config ${XMCDDIR}/discog +REQD_DIRS= ${XMCDDIR} ${XMCDDIR}/cdinfo ${XMCDDIR}/config ${XMCDDIR}/discog pre-configure: cd ${WRKSRC} && \ diff --git a/chat/ser/Makefile b/chat/ser/Makefile index f093473df25..fba98e588be 100644 --- a/chat/ser/Makefile +++ b/chat/ser/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2005/06/18 05:57:05 hira Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= ser-0.8.10_src PKGNAME= ser-0.8.10 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= chat MASTER_SITES= ftp://ftp.berlios.de/pub/ser/latest/src/ @@ -20,7 +20,7 @@ PKG_SYSCONFSUBDIR= ser EGDIR= ${PREFIX}/share/examples/ser CONF_FILES= ${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg -MAKE_DIRS= ${EGDIR} +REQD_DIRS= ${EGDIR} MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q} MAKE_ENV+= BUILDLINK_PREFIX.mysql-client=${BUILDLINK_PREFIX.mysql-client:Q} diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index b8be5917e70..06951a1e6d5 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= gnats-4.0.1 +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GNU:=gnats/} @@ -24,8 +25,8 @@ CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp GNATS_HOME= ${PREFIX}/share/gnats/gnats-db PKG_USERS= gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:${SH} -MAKE_DIRS= ${PREFIX}/share/gnats -MAKE_DIRS+= ${PREFIX}/libexec/gnats +REQD_DIRS= ${PREFIX}/share/gnats +REQD_DIRS+= ${PREFIX}/libexec/gnats OWN_DIRS_PERMS= ${GNATS_HOME} gnats daemon 755 OWN_DIRS_PERMS+= ${GNATS_HOME}/gnats-queue gnats daemon 755 OWN_DIRS_PERMS+= ${GNATS_HOME}/pending gnats daemon 755 diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile index 730056e3012..8005f80def1 100644 --- a/fonts/ghostscript-cidfonts/Makefile +++ b/fonts/ghostscript-cidfonts/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2004/04/24 22:46:10 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $ DISTNAME= ghostscript-cidfonts-20000901 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= # empty DISTFILES= # empty @@ -27,7 +28,7 @@ FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR} FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR} FILES_SUBST+= PKG_INFO=${PKG_TOOLS_BIN}/pkg_info -MAKE_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont +REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont do-install: # nothing diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile index f0b414c2ab5..a09e1b86835 100644 --- a/fonts/ghostscript-cmaps/Makefile +++ b/fonts/ghostscript-cmaps/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2004/04/24 22:46:10 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/20 19:16:21 jlam Exp $ DISTNAME= ghostscript-cmaps-20020913 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= # empty DISTFILES= # empty @@ -27,7 +28,7 @@ FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR} FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR} FILES_SUBST+= PKG_INFO=${PKG_TOOLS_BIN}/pkg_info -MAKE_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap +REQD_DIRS= ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CMap do-install: # nothing diff --git a/games/d2x/Makefile b/games/d2x/Makefile index fe37f6def13..d907dbc1222 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= d2x-0.2.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= games x11 MASTER_SITES= http://icculus.org/d2x/src/ @@ -14,7 +14,7 @@ HAS_CONFIGURE= yes USE_TOOLS+= gmake D2X_DATA= ${PREFIX}/share/games/${PKGBASE} -MAKE_DIRS= ${D2X_DATA} +REQD_DIRS= ${D2X_DATA} MESSAGE_SUBST+= D2X_DATA=${D2X_DATA} # diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile index 83b8858bcd9..9c6442a23c6 100644 --- a/games/nethack-lib/Makefile +++ b/games/nethack-lib/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/08/20 19:16:21 jlam Exp $ # .include "../nethack-lib/Makefile.common" PKGNAME= nethack-lib-${NETHACK_VERSION} +PKGREVISION= 1 COMMENT= Data files for Nethack @@ -19,9 +20,9 @@ CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/record \ CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/logfile \ ${ROOT_USER} games 664 -MAKE_DIRS_PERMS+= ${PREFIX}/share/${NETHACK_DIR} \ +REQD_DIRS_PERMS+= ${PREFIX}/share/${NETHACK_DIR} \ ${ROOT_USER} games 775 -MAKE_DIRS_PERMS+= ${PREFIX}/share/${NETHACK_DIR}/save \ +REQD_DIRS_PERMS+= ${PREFIX}/share/${NETHACK_DIR}/save \ ${ROOT_USER} games 770 .include "../../mk/bsd.pkg.mk" diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index c7fda342552..51dff9146c5 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.44 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2005/08/20 19:16:23 jlam Exp $ # VERSION= 1.1.8 PKGNAME= jdk-${VERSION} -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= lang java MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ \ ftp://ftp.de.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index 54ea1406d2f..91277af211b 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.59 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.60 2005/08/20 19:16:23 jlam Exp $ # .include "Makefile.common" -PKGREVISION= 6 +PKGREVISION= 7 CONFLICTS+= kaffe-nox11-[0-9]* diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile index 2d4d87fef03..234e86a8854 100644 --- a/lang/sablevm-classpath-gui/Makefile +++ b/lang/sablevm-classpath-gui/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:18 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/20 19:16:23 jlam Exp $ # .include "../../lang/sablevm-classpath/Makefile.common" PKGNAME= ${DISTNAME:S/classpath/classpath-gui/} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT+= (GUI libraries) DEPENDS+= sablevm-classpath>=1.1.3nb1:../../lang/sablevm-classpath diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile index 7c259db9c7e..fee410675c9 100644 --- a/lang/sablevm-classpath/Makefile +++ b/lang/sablevm-classpath/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2004/10/03 00:15:02 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/08/20 19:16:23 jlam Exp $ # .include "Makefile.common" -PKGREVISION= 2 +PKGREVISION= 3 INFO_FILES= hacking.info vmintegration.info diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile index fea461c700c..47609005c45 100644 --- a/lang/sablevm/Makefile +++ b/lang/sablevm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:11 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/20 19:16:23 jlam Exp $ # DISTNAME= sablevm-1.1.3 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sablevm/} \ http://devel.sablevm.org/download/1.1.3/ diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile index 0afe3e3bbbb..3da67aa4508 100644 --- a/lang/sun-jdk13/Makefile +++ b/lang/sun-jdk13/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2005/01/30 23:18:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.35 2005/08/20 19:16:23 jlam Exp $ DISTNAME= j2sdk-1_3_1_15-linux-i586 PKGNAME= sun-jdk13-1.0.15 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty COMMENT= Sun's Java(tm) Development Kit 1.3.1 diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile index 7e5b5c73883..7b84aa9e7e6 100644 --- a/lang/sun-jdk14/Makefile +++ b/lang/sun-jdk14/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2005/04/18 15:39:04 jschauma Exp $ +# $NetBSD: Makefile,v 1.26 2005/08/20 19:16:23 jlam Exp $ DISTNAME= j2sdk-1_4_2_08-linux-i586 PKGNAME= sun-jdk14-2.8 -PKGREVISION= # none +PKGREVISION= 1 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2 diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile index 112f5444c15..80ddd697df4 100644 --- a/lang/sun-jdk15/Makefile +++ b/lang/sun-jdk15/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/07/21 18:23:16 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/20 19:16:23 jlam Exp $ DISTNAME= jdk-1_5_0_04-linux-i586 PKGNAME= sun-jdk15-5.0.4 +PKGREVISION= 1 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.5.0 diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile index d53a3159ecb..97c7cafd7d7 100644 --- a/lang/sun-jre13/Makefile +++ b/lang/sun-jre13/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2005/08/20 19:16:23 jlam Exp $ DISTNAME= j2re-1_3_1_15-linux-i586 PKGNAME= sun-jre13-1.0.15 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty COMMENT= Sun's Java(tm) Runtime Environment 1.3.1 diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index ea1972a58ee..5b178909b41 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/08/20 19:16:23 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce DISTNAME= j2re-1_4_2_08-linux-i586 PKGNAME= sun-jre14-2.8 -PKGREVISION= # none +PKGREVISION= 1 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2 diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 7eb26596334..b80aae5c630 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/08/20 19:16:23 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce DISTNAME= jre-1_5_0_04-linux-i586 PKGNAME= sun-jre15-5.0.4 +PKGREVISION= 1 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.5.0 diff --git a/lang/win32-jdk/Makefile b/lang/win32-jdk/Makefile index 0c66b4f46fa..3d351427251 100644 --- a/lang/win32-jdk/Makefile +++ b/lang/win32-jdk/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2005/01/30 23:18:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2005/08/20 19:16:23 jlam Exp $ # # Interix-only "JDK" for pkgsrc, implemented as a script wrapper around the # Win32 Sun JDK/JRE. # DISTNAME= win32-jdk-0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang java MASTER_SITES= # empty DISTFILES= # empty diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index 335ca6bd658..2f9c69c7d73 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2005/07/19 14:00:35 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= cucipop-1.31 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/ @@ -20,7 +20,7 @@ LICENSE= cucipop-license MAKE_ENV+= ROOT_USER="${ROOT_USER}" MAKE_ENV+= ROOT_GROUP="${ROOT_GROUP}" -MAKE_DIRS+= ${PREFIX}/share/cucipop/bulletins +REQD_DIRS+= ${PREFIX}/share/cucipop/bulletins SPECIAL_PERMS+= ${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2755 PKG_OPTIONS_VAR= PKG_OPTIONS.cucipop diff --git a/misc/XFree86-dirs/Makefile b/misc/XFree86-dirs/Makefile index bfb2d3474aa..82dfa738e6c 100644 --- a/misc/XFree86-dirs/Makefile +++ b/misc/XFree86-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/04/28 22:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= XFree86-dirs-1.1 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= # empty DISTFILES= # empty @@ -23,7 +24,7 @@ XFREE86_ONLY_DIRS= # defined .include "../../mk/bsd.prefs.mk" .include "dirs.mk" -MAKE_DIRS+= ${XFREE86_DIRS:O:S/^/${X11ROOT}\//:C/\/\/\/*/\//g} +REQD_DIRS+= ${XFREE86_DIRS:O:S/^/${X11ROOT}\//:C/\/\/\/*/\//g} do-install: # nothing diff --git a/misc/gnome-dirs/Makefile b/misc/gnome-dirs/Makefile index c8c640efec5..d1c41644c05 100644 --- a/misc/gnome-dirs/Makefile +++ b/misc/gnome-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2005/04/28 23:04:08 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= gnome-dirs-1.5 +PKGREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= # empty DISTFILES= # empty @@ -22,7 +23,7 @@ NO_BUILD= # defined .include "dirs.mk" .include "../../mk/bsd.prefs.mk" -MAKE_DIRS+= ${GNOME_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${GNOME_DIRS:O:S/^/${PREFIX}\//} do-install: # nothing diff --git a/misc/gnome1-dirs/Makefile b/misc/gnome1-dirs/Makefile index 03ce5dd6ad8..996450ae185 100644 --- a/misc/gnome1-dirs/Makefile +++ b/misc/gnome1-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2005/04/28 23:04:08 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= gnome1-dirs-1.5 +PKGREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= # empty DISTFILES= # empty @@ -25,7 +26,7 @@ NO_BUILD= # defined .include "../../mk/bsd.prefs.mk" ALL_GNOME_DIRS= ${GNOME_DIRS} ${GNOME1_DIRS} -MAKE_DIRS+= ${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//} do-install: # nothing diff --git a/misc/gnome2-dirs/Makefile b/misc/gnome2-dirs/Makefile index ea504ed6ab1..386abee8528 100644 --- a/misc/gnome2-dirs/Makefile +++ b/misc/gnome2-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2005/04/28 23:04:08 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= gnome2-dirs-1.5 +PKGREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= # empty DISTFILES= # empty @@ -28,7 +29,7 @@ ALL_GNOME_DIRS= ${GNOME2_DIRS} ALL_GNOME_DIRS= ${GNOME_DIRS} ${GNOME2_DIRS} .endif -MAKE_DIRS+= ${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//} do-install: # nothing diff --git a/misc/theme-dirs/Makefile b/misc/theme-dirs/Makefile index e3c1f29a366..34cfaf184c5 100644 --- a/misc/theme-dirs/Makefile +++ b/misc/theme-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2005/05/10 20:21:57 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= theme-dirs-1.1 +PKGREVISION= 1 CATEGORIES= misc gnome kde MASTER_SITES= # empty DISTFILES= # empty @@ -22,7 +23,7 @@ WRKSRC= ${WRKDIR} .include "dirs.mk" .include "../../mk/bsd.prefs.mk" -MAKE_DIRS+= ${THEME_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${THEME_DIRS:O:S/^/${PREFIX}\//} do-install: # nothing diff --git a/misc/xdg-dirs/Makefile b/misc/xdg-dirs/Makefile index 53b78ee3ff2..ac9a7cfd03d 100644 --- a/misc/xdg-dirs/Makefile +++ b/misc/xdg-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2005/04/28 23:04:08 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= xdg-dirs-1.2 +PKGREVISION= 1 CATEGORIES= misc gnome kde MASTER_SITES= # empty DISTFILES= # empty @@ -23,7 +24,7 @@ WRKSRC= ${WRKDIR} .include "dirs.mk" .include "../../mk/bsd.prefs.mk" -MAKE_DIRS+= ${XDG_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${XDG_DIRS:O:S/^/${PREFIX}\//} do-install: # nothing diff --git a/misc/xdg-x11-dirs/Makefile b/misc/xdg-x11-dirs/Makefile index c41d8a1abff..15b0aebc6cf 100644 --- a/misc/xdg-x11-dirs/Makefile +++ b/misc/xdg-x11-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= xdg-x11-dirs-1.2 +PKGREVISION= 1 CATEGORIES= misc gnome kde MASTER_SITES= # empty DISTFILES= # empty @@ -27,7 +28,7 @@ WRKSRC= ${WRKDIR} .if ${X11PREFIX} == ${LOCALBASE} DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs .else -MAKE_DIRS+= ${XDG_X11_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${XDG_X11_DIRS:O:S/^/${PREFIX}\//} .endif do-install: # nothing diff --git a/misc/xorg-dirs/Makefile b/misc/xorg-dirs/Makefile index 82613eb8b79..db9ca57aab8 100644 --- a/misc/xorg-dirs/Makefile +++ b/misc/xorg-dirs/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2005/04/28 23:04:08 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= xorg-dirs-1.1 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= # empty DISTFILES= # empty @@ -23,7 +24,7 @@ XORG_ONLY_DIRS= # defined .include "../../mk/bsd.prefs.mk" .include "dirs.mk" -MAKE_DIRS+= ${XORG_DIRS:O:S/^/${X11ROOT}\//} +REQD_DIRS+= ${XORG_DIRS:O:S/^/${X11ROOT}\//} do-install: # nothing diff --git a/mk/java-env.mk b/mk/java-env.mk index bd4cda47b91..4f19de5cba1 100644 --- a/mk/java-env.mk +++ b/mk/java-env.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-env.mk,v 1.5 2005/03/19 16:46:45 jmmv Exp $ +# $NetBSD: java-env.mk,v 1.6 2005/08/20 19:16:21 jlam Exp $ # # This Makefile fragment handles Java wrappers and is meant to be included # by packages that provide a Java build-time and/or run-time environment. @@ -81,7 +81,7 @@ install-java-wrapper-${w}: # Handle the ${PREFIX}/java shared directory automatically. USE_PKGINSTALL= YES -MAKE_DIRS+= ${PREFIX}/java +REQD_DIRS+= ${PREFIX}/java PRINT_PLIST_AWK+= /^@dirrm java$$/ { next; } .endif # JAVA_ENV_MK diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 214f3b3a4b9..50ac8c6238b 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:20 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= gstreamer-0.8.10 +PKGREVISION= 1 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gstreamer/0.8/} EXTRACT_SUFX= .tar.bz2 @@ -27,7 +28,7 @@ CONFIGURE_ARGS+= HAVE_GTK_DOC=no PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-control.pc.in PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer.pc.in -MAKE_DIRS+= ${GST_DBDIR} +REQD_DIRS+= ${GST_DBDIR} PYTHON_VERSIONS_ACCEPTED= 24 23 22 diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile index 4e439bc744f..0c9df957584 100644 --- a/net/netdisco/Makefile +++ b/net/netdisco/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= netdisco-0.94_with_mibs PKGNAME= netdisco-0.94 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netdisco/} @@ -93,7 +94,7 @@ CONF_FILES_PERMS+= ${EGDIR}/netdisco.conf ${PKG_SYSCONFDIR}/netdisco.conf \ ${NETDISCOUSER} ${NETDISCOGROUP} 0660 CONF_FILES+= ${EGDIR}/netdisco-topology.txt ${PKG_SYSCONFDIR}/netdisco-topology.txt -MAKE_DIRS= ${PREFIX}/netdisco ${EGDIR} +REQD_DIRS= ${PREFIX}/netdisco ${EGDIR} OWN_DIRS_PERMS+= ${VARBASE}/netdisco ${NETDISCOUSER} ${NETDISCOGROUP} 0775 RCD_SCRIPTS= netdisco diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile index 4bcadcb0841..3faa596e788 100644 --- a/pkgtools/pkg_alternatives/Makefile +++ b/pkgtools/pkg_alternatives/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2005/05/21 04:10:18 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= pkg_alternatives-1.3 +PKGREVISION= 1 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -25,8 +26,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= PKG_ALTERNATIVES=${PREFIX}/sbin/pkg_alternatives -MAKE_DIRS= ${DBDIR} -MAKE_DIRS+= ${PKG_SYSCONFDIR} +REQD_DIRS= ${DBDIR} +MAKE_DIRS= ${PKG_SYSCONFDIR} PKG_SYSCONFSUBDIR= pkg_alternatives CONF_FILES= ${EGDIR}/filter.conf ${PKG_SYSCONFDIR}/filter.conf diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile index cce6baceb59..abd34b4d5cd 100644 --- a/textproc/xmlcatmgr/Makefile +++ b/textproc/xmlcatmgr/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2005/08/19 18:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/08/20 19:16:21 jlam Exp $ # DISTNAME= xmlcatmgr-2.2 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlcatmgr/} @@ -22,7 +23,7 @@ CONF_FILES= ${EGDIR}/catalog.etc.sgml ${PKG_SYSCONFDIR}/sgml/catalog CONF_FILES+= ${EGDIR}/catalog.etc.xml ${PKG_SYSCONFDIR}/xml/catalog CONF_FILES+= ${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog CONF_FILES+= ${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog -MAKE_DIRS= ${PREFIX}/share/sgml ${PREFIX}/share/xml +REQD_DIRS= ${PREFIX}/share/sgml ${PREFIX}/share/xml PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ { next; } diff --git a/www/apache/Makefile b/www/apache/Makefile index 6371c19ee40..426f7e214e3 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.168 2005/08/19 18:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.169 2005/08/20 19:16:22 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). DISTNAME= apache_1.3.33 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} @@ -141,8 +141,8 @@ CONF_FILES+= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic CONF_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types RCD_SCRIPTS= apache -MAKE_DIRS= ${PREFIX}/share/httpd -MAKE_DIRS+= ${PREFIX}/share/httpd/htdocs +REQD_DIRS= ${PREFIX}/share/httpd +REQD_DIRS+= ${PREFIX}/share/httpd/htdocs OWN_DIRS+= ${PREFIX}/lib/httpd OWN_DIRS+= ${VARBASE}/httpd OWN_DIRS+= ${VARBASE}/log/httpd diff --git a/www/websvn/Makefile b/www/websvn/Makefile index 8ca610caa76..e5d740ca524 100644 --- a/www/websvn/Makefile +++ b/www/websvn/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2005/05/03 18:04:10 seb Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/20 19:16:22 jlam Exp $ # DISTNAME= WebSVN_161 PKGNAME= websvn-1.61 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= http://websvn.tigris.org/files/documents/1380/14334/ @@ -29,7 +29,7 @@ HTTPD_ROOT?= share/httpd/htdocs BUILD_DEFS+= HTTPD_ROOT EGDIR= ${PREFIX}/share/examples/${PKGBASE} -MAKE_DIRS= ${PREFIX}/${HTTPD_ROOT}/websvn/include +REQD_DIRS= ${PREFIX}/${HTTPD_ROOT}/websvn/include CONF_FILES= ${EGDIR}/distconfig.inc ${PKG_SYSCONFDIR}/config.inc INSTALLATION_DIRS= ${HTTPD_ROOT}/websvn share/examples/${PKGBASE} diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 0e2eb1d8107..979e0d565f0 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.89 2005/08/10 20:56:29 jlam Exp $ +# $NetBSD: Makefile,v 1.90 2005/08/20 19:16:22 jlam Exp $ # DISTNAME= gtk+-2.6.9 PKGNAME= ${DISTNAME:S/gtk/gtk2/} +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \ @@ -43,7 +44,7 @@ PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in -MAKE_DIRS+= ${PREFIX}/libdata/gtk-2.0 +REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 BUILD_DIRS= ${WRKSRC} ${WRKSRC}/demos/gtk-demo diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index a22c071471c..1ec21c317f1 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.91 2005/07/30 11:04:59 markd Exp $ +# $NetBSD: Makefile,v 1.92 2005/08/20 19:16:22 jlam Exp $ DISTNAME= kdelibs-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop @@ -27,7 +28,7 @@ SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docboo LIBS.NetBSD+= ${EXPORT_SYMBOLS_LDFLAGS} -MAKE_DIRS+= ${KDE3_DIRS:O:S/^/${PREFIX}\//} +REQD_DIRS+= ${KDE3_DIRS:O:S/^/${PREFIX}\//} REPLACE_PERL= \ dcop/dcopidlng/kalyptus \ diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index 3db25c56af2..9d242d581a5 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2005/06/15 09:00:15 hira Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/20 19:16:22 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 COMMENT= XFce4 desktop background manager @@ -25,7 +25,7 @@ CONF_FILES+= ${EGDIR}/xfce-registered-categories.xml.${_l} \ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} -MAKE_DIRS+= ${XFCE4_EGBASE} ${EGDIR} +REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 72c53c89df4..4f6d08bc0a2 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2005/06/15 09:01:59 hira Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:22 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-panel-${XFCE4_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 COMMENT= XFce4 panel @@ -23,7 +23,7 @@ CONF_FILES+= ${EGDIR}/contents.xml.${_l} \ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} -MAKE_DIRS+= ${XFCE4_EGBASE} ${EGDIR} +REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index bbc1ff18219..09acb7039a9 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2005/06/17 05:49:35 hira Exp $ +# $NetBSD: Makefile,v 1.4 2005/08/20 19:16:22 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-session-${XFCE4_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= XFce4 session manager @@ -16,7 +16,7 @@ CONF_FILES= ${EGDIR}/xfce4-session.rc \ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} -MAKE_DIRS+= ${XFCE4_EGBASE} ${EGDIR} +REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 9e02d405960..1ee711ffc14 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2005/06/15 09:04:32 hira Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/20 19:16:23 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-utils-${XFCE4_VERSION} PKGNAME= xfce4-utils-${XFCE4_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 COMMENT= XFce4 utilities @@ -14,7 +14,7 @@ PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} CONF_FILES= ${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc -MAKE_DIRS+= ${EGDIR} +REQD_DIRS+= ${EGDIR} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} -- cgit v1.2.3