summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-09-18 16:25:08 +0000
committerjmmv <jmmv@pkgsrc.org>2003-09-18 16:25:08 +0000
commit6d9ccf016ffd2af4f126e6d58b7ae9d0e61f8330 (patch)
tree059002a09ab942607c4e739ae3422b863a0c90f4
parent3c4d07b4201946eda3d2c72f892f3ac600b74b65 (diff)
downloadpkgsrc-6d9ccf016ffd2af4f126e6d58b7ae9d0e61f8330.tar.gz
Specify the category when including other files and when depending on other
packages. From PR pkg/21864 by ccatrian at eml.cc.
-rw-r--r--audio/mpg123-nas/Makefile4
-rw-r--r--databases/mysql-server/Makefile4
-rw-r--r--databases/postgresql-client/Makefile6
-rw-r--r--databases/postgresql-docs/Makefile4
-rw-r--r--databases/postgresql-lib/Makefile4
-rw-r--r--databases/postgresql-server/Makefile6
-rw-r--r--devel/libtool-base/Makefile4
-rw-r--r--devel/libtool-info/Makefile4
-rw-r--r--emulators/suse_audio/Makefile6
-rw-r--r--emulators/suse_base/Makefile6
-rw-r--r--emulators/suse_compat/Makefile6
-rw-r--r--emulators/suse_glx/Makefile4
-rw-r--r--emulators/suse_gtk/Makefile6
-rw-r--r--emulators/suse_libc5/Makefile6
-rw-r--r--emulators/suse_libjpeg/Makefile6
-rw-r--r--emulators/suse_libpng/Makefile6
-rw-r--r--emulators/suse_libtiff/Makefile6
-rw-r--r--emulators/suse_openmotif/Makefile6
-rw-r--r--emulators/suse_vmware/Makefile8
-rw-r--r--emulators/suse_x11/Makefile6
-rw-r--r--emulators/suse_xforms/Makefile6
-rw-r--r--emulators/vmware/Makefile4
-rw-r--r--graphics/MesaLib/Makefile4
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile4
-rw-r--r--graphics/glu/Makefile4
-rw-r--r--graphics/glut/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--print/ghostscript/Makefile4
28 files changed, 71 insertions, 71 deletions
diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
index c86bcaee4e9..04119685b3c 100644
--- a/audio/mpg123-nas/Makefile
+++ b/audio/mpg123-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/11/28 12:24:06 markd Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/18 16:25:14 jmmv Exp $
#
PKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
@@ -11,7 +11,7 @@ CONFLICTS+= mpg123-[0-9]*
USE_X11BASE= # defined
-.include "../mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
.include "../../audio/nas/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index ac13ad14e33..f1bdd756981 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2003/09/17 21:03:07 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2003/09/18 16:25:14 jmmv Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 5
SVR4_PKGNAME= mysqs
COMMENT= MySQL, a free SQL database (server)
-.include "../mysql-client/Makefile.common"
+.include "../databases/mysql-client/Makefile.common"
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --without-berkeley-db
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index c5c830a8bc1..6d1f4ece2f8 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:16 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/18 16:25:16 jmmv Exp $
PKGNAME= postgresql-client-${BASE_VERS}
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database client programs
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-zlib
@@ -28,7 +28,7 @@ post-install:
cd ${PREFIX}/man && \
${PAX} -O -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
-.include "../postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 11a3dde43e7..bc04de45117 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/25 15:13:48 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/18 16:25:17 jmmv Exp $
PKGNAME= postgresql-docs-${BASE_VERS}
SVR4_PKGNAME= pstgd
COMMENT= PostgreSQL database system documentation
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
BUILD_DIRS= ${WRKSRC}/doc
DOCDIR= ${PREFIX}/share/doc/postgresql
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 9c7acf987b1..e36edadd569 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2003/03/25 15:13:48 cjep Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/18 16:25:18 jmmv Exp $
PKGNAME= postgresql-lib-${BASE_VERS}
SVR4_PKGNAME= pstgl
COMMENT= PostgreSQL database headers and libraries
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
BUILD_DIRS= ${WRKSRC}/src/include
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index dfe81e41fe5..39610a18afc 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/08/30 22:51:14 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2003/09/18 16:25:19 jmmv Exp $
PKGNAME= postgresql-server-${BASE_VERS}
SVR4_PKGNAME= pstgs
@@ -10,7 +10,7 @@ DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
# mips has no TAS implementation
NOT_FOR_PLATFORM= *-*-mips
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
@@ -68,5 +68,5 @@ post-install:
${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \
`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
-.include "../postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 7f9817e73f9..54791a93d9c 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/02/17 15:27:59 dillo Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/18 16:25:12 jmmv Exp $
#
-.include "../libtool/Makefile.common"
+.include "../../devel/libtool/Makefile.common"
PKGNAME= ${PKGPFX:C/-/-base-/}
SVR4_PKGNAME= ltoob
diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile
index d15d5b385ee..4e5880406e4 100644
--- a/devel/libtool-info/Makefile
+++ b/devel/libtool-info/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 10:44:46 seb Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/18 16:25:13 jmmv Exp $
#
-.include "../libtool/Makefile.common"
+.include "../../devel/libtool/Makefile.common"
PKGNAME= ${PKGPFX:C/-/-info-/}
SVR4_PKGNAME= ltooi
diff --git a/emulators/suse_audio/Makefile b/emulators/suse_audio/Makefile
index 388ddf7d85c..c0da4127ded 100644
--- a/emulators/suse_audio/Makefile
+++ b/emulators/suse_audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:36:02 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/18 16:25:20 jmmv Exp $
DISTNAME= audiofile
PKGNAME= suse_audio-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for audio libraries
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -20,5 +20,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index f5217bf0c7d..4c9601a8879 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2003/07/17 21:36:03 grant Exp $
+# $NetBSD: Makefile,v 1.45 2003/09/18 16:25:21 jmmv Exp $
DISTNAME= suse_base-${SUSE_VERSION}
PKGREVISION= 4
@@ -24,7 +24,7 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= aaa_dir.rpm gppshare.rpm ncurses.rpm \
readline.rpm bash.rpm sh-utils.rpm
-.include "../suse_linux/arch.mk"
+.include "../../emulators/suse_linux/arch.mk"
.if ${SUSE_ARCH} == "i386"
RPMFILES+= glibc-2.2.4-78.${SUSE_ARCH}.rpm libz-1.1.3-597.${SUSE_ARCH}.rpm
@@ -70,5 +70,5 @@ do-install:
${CHMOD} +x ${LINUX_LDD}
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_compat/Makefile b/emulators/suse_compat/Makefile
index fff42e725c3..85a815c4745 100644
--- a/emulators/suse_compat/Makefile
+++ b/emulators/suse_compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:36:05 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/18 16:25:21 jmmv Exp $
DISTNAME= compat
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package with old shared libraries
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -21,5 +21,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_glx/Makefile b/emulators/suse_glx/Makefile
index f4fe731f10b..5dc4e305e50 100644
--- a/emulators/suse_glx/Makefile
+++ b/emulators/suse_glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:36:08 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/18 16:25:23 jmmv Exp $
DISTNAME= glx
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -20,5 +20,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_gtk/Makefile b/emulators/suse_gtk/Makefile
index 5371bfdcd67..034cd59d966 100644
--- a/emulators/suse_gtk/Makefile
+++ b/emulators/suse_gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:36:09 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/18 16:25:23 jmmv Exp $
DISTNAME= suse_gtk-${SUSE_VERSION}
CATEGORIES= emulators
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for GTK binaries
-DEPENDS+= suse_x11>=${SUSE_VERSION}:../suse_x11
+DEPENDS+= suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -20,5 +20,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= glib.rpm gtk.rpm
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_libc5/Makefile b/emulators/suse_libc5/Makefile
index 94bbdcf5641..2874f67c194 100644
--- a/emulators/suse_libc5/Makefile
+++ b/emulators/suse_libc5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:36:10 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/18 16:25:24 jmmv Exp $
DISTNAME= shlibs5
PKGNAME= suse_libc5-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for libc5 binaries
-DEPENDS+= suse_compat>=${SUSE_VERSION}:../suse_compat
+DEPENDS+= suse_compat>=${SUSE_VERSION}:../../emulators/suse_compat
CONFLICTS+= mozilla-bin-[0-9]*
CONFLICTS+= phoenix-bin-[0-9]*
@@ -23,5 +23,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_libjpeg/Makefile b/emulators/suse_libjpeg/Makefile
index 6dc8c5edc7d..2b8933a4aa1 100644
--- a/emulators/suse_libjpeg/Makefile
+++ b/emulators/suse_libjpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:36:11 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/18 16:25:26 jmmv Exp $
DISTNAME= libjpeg
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for the JPEG library
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -21,5 +21,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_libpng/Makefile b/emulators/suse_libpng/Makefile
index 1e9cddedf5f..dbc1b2da444 100644
--- a/emulators/suse_libpng/Makefile
+++ b/emulators/suse_libpng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:36:12 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/18 16:25:26 jmmv Exp $
DISTNAME= libpng
PKGREVISION= 1
@@ -12,7 +12,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for the PNG library
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -31,5 +31,5 @@ RPMFILES= ${DISTNAME}-2.1.0.12-131.${SUSE_ARCH}${EXTRACT_SUFX}
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
.endif
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_libtiff/Makefile b/emulators/suse_libtiff/Makefile
index a5e86c5d7ab..869a52eb71f 100644
--- a/emulators/suse_libtiff/Makefile
+++ b/emulators/suse_libtiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:36:12 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/18 16:25:27 jmmv Exp $
DISTNAME= libtiff
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for the TIFF library
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -21,5 +21,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_openmotif/Makefile b/emulators/suse_openmotif/Makefile
index 37e67cdb4d5..b0acc428f2d 100644
--- a/emulators/suse_openmotif/Makefile
+++ b/emulators/suse_openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:36:14 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/18 16:25:28 jmmv Exp $
DISTNAME= openmotif
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for the Motif libraries
-DEPENDS+= suse_x11>=${SUSE_VERSION}:../suse_x11
+DEPENDS+= suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -20,5 +20,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_vmware/Makefile b/emulators/suse_vmware/Makefile
index f43ea5b6ce1..09540887f10 100644
--- a/emulators/suse_vmware/Makefile
+++ b/emulators/suse_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:36:16 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/18 16:25:29 jmmv Exp $
DISTNAME= fileutils-4.1-154.i386
PKGNAME= suse_vmware-${SUSE_VERSION}
@@ -10,8 +10,8 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package to support running VMware
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
-DEPENDS+= suse_x11>=${SUSE_VERSION}:../suse_x11
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
+DEPENDS+= suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
ONLY_FOR_PLATFORM= NetBSD-*-i386
@@ -35,5 +35,5 @@ post-install:
${AWK} '{print("@unexec rm -f %D/${EMULSUBDIR}/dev/"$$2)}' \
>>${PLIST_SRC}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_x11/Makefile b/emulators/suse_x11/Makefile
index 50232e3a03f..d1d48f058c5 100644
--- a/emulators/suse_x11/Makefile
+++ b/emulators/suse_x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 21:36:17 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/18 16:25:29 jmmv Exp $
DISTNAME= suse_x11-${SUSE_VERSION}
PKGREVISION= 2
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for X11 binaries
-DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
+DEPENDS+= suse_base>=${SUSE_VERSION}:../../emulators/suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -45,5 +45,5 @@ post-install:
cd ${EMULDIR}/usr/X11R6/lib && ${LN} -sf $$link $${link%.[0-9]}; \
done
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_xforms/Makefile b/emulators/suse_xforms/Makefile
index ea0ad5656ee..7b7bbbc3bba 100644
--- a/emulators/suse_xforms/Makefile
+++ b/emulators/suse_xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:36:18 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/18 16:25:30 jmmv Exp $
DISTNAME= xforms
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package for xforms binaries
-DEPENDS+= suse_x11>=${SUSE_VERSION}:../suse_x11
+DEPENDS+= suse_x11>=${SUSE_VERSION}:../../emulators/suse_x11
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc
@@ -20,5 +20,5 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
RPMFILES= ${DISTNAME}${EXTRACT_SUFX}
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index e818310856b..ffb2f1fac87 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:36:21 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/18 16:25:31 jmmv Exp $
DISTNAME= VMware-2.0.4-1142
PKGNAME= vmware-2.0.4
@@ -80,5 +80,5 @@ post-install:
${ECHO} "vmnet1.HostOnlyNetMask = \"255.255.255.0\""; \
) > ${VMWARE_CFG_DIR}/config
-.include "../suse_linux/Makefile.application"
+.include "../../emulators/suse_linux/Makefile.application"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 446ed3b7dea..4a0e768b9ff 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2003/08/26 01:43:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/18 16:25:08 jmmv Exp $
PKGNAME= MesaLib-${MESA_VERSION}
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
MAINTAINER= rh@NetBSD.org
COMMENT= Graphics library similar to SGI's OpenGL
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
USE_BUILDLINK2= yes
USE_X11BASE= yes
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 05a4c29b5ba..07ff75d3e04 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2003/07/21 16:51:41 martti Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/18 16:25:10 jmmv Exp $
-.include "../gdk-pixbuf/Makefile.common"
+.include "../../graphics/gdk-pixbuf/Makefile.common"
PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
PKGREVISION= 1
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 413492a070a..55305d38369 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/08/26 01:43:49 jschauma Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/18 16:25:11 jmmv Exp $
PKGNAME= ${DISTNAME:C/MesaLib/glu/}
WRKSRC= ${WRKDIR}/${DISTNAME:C/Lib//}
@@ -8,7 +8,7 @@ COMMENT= GLU polygon tesselation facility for Mesa
CONFLICTS+= Mesa-glx-[0-9]*
CONFLICTS+= Mesa<3.2.1
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
USE_BUILDLINK2= yes
USE_X11BASE= yes
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 93a9dd68514..1bdcb6632a2 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/08/26 01:43:50 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/18 16:25:12 jmmv Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -10,7 +10,7 @@ COMMENT= GLUT Graphics library similar to SGI's OpenGL
CONFLICTS+= Mesa-glx-[0-9]*
CONFLICTS+= Mesa<3.2.1
-.include "../Mesa/Makefile.common"
+.include "../../graphics/Mesa/Makefile.common"
USE_BUILDLINK2= yes
USE_X11BASE= yes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 2165348e952..c078e71cf19 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2003/07/17 21:42:08 grant Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/18 16:25:15 jmmv Exp $
-.include "../ImageMagick/Makefile.common"
+.include "../graphics/ImageMagick/Makefile.common"
PKGNAME= p5-PerlMagick-${DISTVERSION}
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 2a2d8770c80..8896821bba8 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/02/23 00:57:52 itohy Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/18 16:25:10 jmmv Exp $
PKGNAME= ghostscript-${GS_VERS}
PKGREVISION= 4
@@ -8,6 +8,6 @@ USE_X11= YES
GS_DISPLAY_DEVICE= x11.dev
XLIBS= Xt SM ICE Xext X11
-.include "../ghostscript-nox11/Makefile.common"
+.include "../../print/ghostscript-nox11/Makefile.common"
MAKEFRAGS+= ${FILESDIR}/devs.x11