summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-11-01 09:41:13 +0000
committerjlam <jlam@pkgsrc.org>2001-11-01 09:41:13 +0000
commit1ea58d26e32cd3e5c9dcef68b3d89e8c1b40f364 (patch)
tree1f39af92e9ae3b85e6995203a635d8b2ae73e9e2
parent6fc613f97a0aaf3ffa0cf3bc3a76434b0f60bdfe (diff)
downloadpkgsrc-1ea58d26e32cd3e5c9dcef68b3d89e8c1b40f364.tar.gz
Change reachover references into another package's pkg/ directory into
references to the other package's base directory. This is needed after the files in the pkg/ directory were dispersed into the base directory.
-rw-r--r--lang/pgcc/Makefile6
-rw-r--r--print/ghostscript-nox11/Makefile.common5
-rw-r--r--wm/wmx/Makefile.common4
-rw-r--r--www/ns-plugger-communicator/Makefile6
-rw-r--r--www/ns-plugger-navigator/Makefile6
-rw-r--r--www/php4/Makefile.module6
-rw-r--r--x11/xscreensaver-gnome/Makefile4
7 files changed, 18 insertions, 19 deletions
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 255d2002fb9..ffba656ff50 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:17 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/01 09:41:13 jlam Exp $
DISTNAME= gcc-2.95.2
PKGNAME= pgcc-2.95.2.1
@@ -24,9 +24,9 @@ ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
FILESDIR= ${.CURDIR}/../../lang/gcc/files
PATCHDIR= ${.CURDIR}/../../lang/gcc/patches
-PKGDIR= ${.CURDIR}/../../lang/gcc/pkg
+PKGDIR= ${.CURDIR}/../../lang/gcc
-DESCR_SRC= ${.CURDIR}/pkg/DESCR
+DESCR_SRC= ${.CURDIR}/DESCR
.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
MACHINE_GCC_PLATFORM= ${MACHINE_GNU_PLATFORM}elf
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 5c19fcba11a..0d59d4fa21b 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2001/08/29 12:51:26 itohy Exp $
+# $NetBSD: Makefile.common,v 1.21 2001/11/01 09:41:13 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -87,8 +87,7 @@ EXTRACT_LIST+= ${PRESCR_DRV}.tar.gz
DISTINFO_FILE= ${.CURDIR}/../../print/ghostscript-nox11/distinfo
FILESDIR= ${.CURDIR}/../../print/ghostscript-nox11/files
PATCHDIR= ${.CURDIR}/../../print/ghostscript-nox11/patches
-SCRIPTDIR= ${.CURDIR}/../../print/ghostscript-nox11/scripts
-PLIST_SRC= ${.CURDIR}/../../print/ghostscript-nox11/pkg/PLIST
+PLIST_SRC= ${.CURDIR}/../../print/ghostscript-nox11/PLIST
EXTRACT_ONLY= ${GS_SOURCES}
DIST_SUBDIR= ghostscript
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index 6a93bafdd35..81b1d64374c 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2001/07/27 20:40:00 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2001/11/01 09:41:14 jlam Exp $
DISTNAME= wmx-6
WMX_VERS= 6.0
@@ -16,7 +16,7 @@ ALL_TARGET= depend all
DISTINFO_FILE= ${.CURDIR}/../../wm/wmx/distinfo
PATCHDIR= ${.CURDIR}/../../wm/wmx/patches
-PLIST_SRC= ${.CURDIR}/../../wm/wmx/pkg/PLIST
+PLIST_SRC= ${.CURDIR}/../../wm/wmx/PLIST
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin
diff --git a/www/ns-plugger-communicator/Makefile b/www/ns-plugger-communicator/Makefile
index c658efd589b..8d814018b52 100644
--- a/www/ns-plugger-communicator/Makefile
+++ b/www/ns-plugger-communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/01 09:41:14 jlam Exp $
#
COMMENT= streaming multimedia plugin for Netscape (communicator)
@@ -8,7 +8,7 @@ COMMONDIR= ../ns-plugger-common
DEPENDS+= ns-plugger-common-[0-9]*:${COMMONDIR}
-PLIST_SRC= ${.CURDIR}/pkg/PLIST
-PKGDIR= ${.CURDIR}/${COMMONDIR}/pkg
+PLIST_SRC= ${.CURDIR}/PLIST
+PKGDIR= ${.CURDIR}/${COMMONDIR}
.include "${COMMONDIR}/Makefile"
diff --git a/www/ns-plugger-navigator/Makefile b/www/ns-plugger-navigator/Makefile
index e9960bb535d..5e51a6f2947 100644
--- a/www/ns-plugger-navigator/Makefile
+++ b/www/ns-plugger-navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:54 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/01 09:41:14 jlam Exp $
#
COMMENT= streaming multimedia plugin for Netscape (navigator)
@@ -8,7 +8,7 @@ COMMONDIR= ../ns-plugger-common
DEPENDS+= ns-plugger-common-[0-9]*:${COMMONDIR}
-PLIST_SRC= ${.CURDIR}/pkg/PLIST
-PKGDIR= ${.CURDIR}/${COMMONDIR}/pkg
+PLIST_SRC= ${.CURDIR}/PLIST
+PKGDIR= ${.CURDIR}/${COMMONDIR}
.include "${COMMONDIR}/Makefile"
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 0bca922a013..3019d90d042 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.12 2001/10/16 12:44:16 tron Exp $
+# $NetBSD: Makefile.module,v 1.13 2001/11/01 09:41:14 jlam Exp $
#
# This Makefile is provided to ease creating PHP4 packages for the extension
# modules distributed in the PHP4 sources.
@@ -38,8 +38,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
# Ensure we export symbols in the linked shared objects.
LDFLAGS+= -Wl,--export-dynamic
-PLIST_SRC= ${.CURDIR}/../../www/php4/pkg/PLIST.module
-MESSAGE_SRC= ${.CURDIR}/../../www/php4/pkg/MESSAGE.module
+PLIST_SRC= ${.CURDIR}/../../www/php4/PLIST.module
+MESSAGE_SRC= ${.CURDIR}/../../www/php4/MESSAGE.module
MESSAGE_SUBST+= MODNAME=${PKGMODNAME}
MESSAGE_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index d42caf7c645..e302ab44a4b 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:07:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/01 09:41:15 jlam Exp $
#
PKGNAME= ${DISTNAME:S/-/-gnome-/}
@@ -9,6 +9,6 @@ DEPENDS+= control-center>=1.2.0:../../x11/controlcenter
CONFLICTS+= xscreensaver-[0-9]*
-PLIST_SRC= ${.CURDIR}/pkg/PLIST
+PLIST_SRC= ${.CURDIR}/PLIST
.include "../../x11/xscreensaver/Makefile.common"