pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Use REQD_DIRS instead of MAKE_DIRS for directories und...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d3a7d32cea48
branches: trunk
changeset: 498354:d3a7d32cea48
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Aug 20 19:16:21 2005 +0000
description:
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.
diffstat:
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(-)
diffs (truncated from 842 to 300 lines):
diff -r 25f761e2041b -r d3a7d32cea48 audio/xmcd/Makefile
--- a/audio/xmcd/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/audio/xmcd/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 @@
.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 -r 25f761e2041b -r d3a7d32cea48 chat/ser/Makefile
--- a/chat/ser/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/chat/ser/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 @@
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 -r 25f761e2041b -r d3a7d32cea48 databases/gnats/Makefile
--- a/databases/gnats/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/databases/gnats/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 @@
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 -r 25f761e2041b -r d3a7d32cea48 fonts/ghostscript-cidfonts/Makefile
--- a/fonts/ghostscript-cidfonts/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/fonts/ghostscript-cidfonts/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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+= 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 -r 25f761e2041b -r d3a7d32cea48 fonts/ghostscript-cmaps/Makefile
--- a/fonts/ghostscript-cmaps/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/fonts/ghostscript-cmaps/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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+= 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 -r 25f761e2041b -r d3a7d32cea48 games/d2x/Makefile
--- a/games/d2x/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/games/d2x/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 @@
USE_TOOLS+= gmake
D2X_DATA= ${PREFIX}/share/games/${PKGBASE}
-MAKE_DIRS= ${D2X_DATA}
+REQD_DIRS= ${D2X_DATA}
MESSAGE_SUBST+= D2X_DATA=${D2X_DATA}
#
diff -r 25f761e2041b -r d3a7d32cea48 games/nethack-lib/Makefile
--- a/games/nethack-lib/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/games/nethack-lib/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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}/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 -r 25f761e2041b -r d3a7d32cea48 lang/jdk/Makefile
--- a/lang/jdk/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/jdk/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/kaffe/Makefile
--- a/lang/kaffe/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/kaffe/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sablevm-classpath-gui/Makefile
--- a/lang/sablevm-classpath-gui/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sablevm-classpath-gui/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sablevm-classpath/Makefile
--- a/lang/sablevm-classpath/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sablevm-classpath/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sablevm/Makefile
--- a/lang/sablevm/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sablevm/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sun-jdk13/Makefile
--- a/lang/sun-jdk13/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sun-jdk13/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sun-jdk14/Makefile
--- a/lang/sun-jdk14/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sun-jdk14/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sun-jdk15/Makefile
--- a/lang/sun-jdk15/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sun-jdk15/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sun-jre13/Makefile
--- a/lang/sun-jre13/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sun-jre13/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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 -r 25f761e2041b -r d3a7d32cea48 lang/sun-jre14/Makefile
--- a/lang/sun-jre14/Makefile Sat Aug 20 19:13:58 2005 +0000
+++ b/lang/sun-jre14/Makefile Sat Aug 20 19:16:21 2005 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index