[pkgsrc/trunk]: pkgsrc Specify the category when including other files and wh...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Specify the category when including other files and wh...
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:00:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/417266fac66f
branches:  trunk
changeset: 461631:417266fac66f
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Sep 18 16:25:08 2003 +0000

description:
Specify the category when including other files and when depending on other
packages.  From PR pkg/21864 by ccatrian at eml.cc.

diffstat:

 audio/mpg123-nas/Makefile            |  4 ++--
 databases/mysql-server/Makefile      |  4 ++--
 databases/postgresql-client/Makefile |  6 +++---
 databases/postgresql-docs/Makefile   |  4 ++--
 databases/postgresql-lib/Makefile    |  4 ++--
 databases/postgresql-server/Makefile |  6 +++---
 devel/libtool-base/Makefile          |  4 ++--
 devel/libtool-info/Makefile          |  4 ++--
 emulators/suse_audio/Makefile        |  6 +++---
 emulators/suse_base/Makefile         |  6 +++---
 emulators/suse_compat/Makefile       |  6 +++---
 emulators/suse_glx/Makefile          |  4 ++--
 emulators/suse_gtk/Makefile          |  6 +++---
 emulators/suse_libc5/Makefile        |  6 +++---
 emulators/suse_libjpeg/Makefile      |  6 +++---
 emulators/suse_libpng/Makefile       |  6 +++---
 emulators/suse_libtiff/Makefile      |  6 +++---
 emulators/suse_openmotif/Makefile    |  6 +++---
 emulators/suse_vmware/Makefile       |  8 ++++----
 emulators/suse_x11/Makefile          |  6 +++---
 emulators/suse_xforms/Makefile       |  6 +++---
 emulators/vmware/Makefile            |  4 ++--
 graphics/MesaLib/Makefile            |  4 ++--
 graphics/gdk-pixbuf-gnome/Makefile   |  4 ++--
 graphics/glu/Makefile                |  4 ++--
 graphics/glut/Makefile               |  4 ++--
 graphics/p5-PerlMagick/Makefile      |  4 ++--
 print/ghostscript/Makefile           |  4 ++--
 28 files changed, 71 insertions(+), 71 deletions(-)

diffs (truncated from 571 to 300 lines):

diff -r 3da658984142 -r 417266fac66f audio/mpg123-nas/Makefile
--- a/audio/mpg123-nas/Makefile Thu Sep 18 14:45:23 2003 +0000
+++ b/audio/mpg123-nas/Makefile Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 
 USE_X11BASE=   # defined
 
-.include "../mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/nas/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3da658984142 -r 417266fac66f databases/mysql-server/Makefile
--- a/databases/mysql-server/Makefile   Thu Sep 18 14:45:23 2003 +0000
+++ b/databases/mysql-server/Makefile   Thu Sep 18 16:25:08 2003 +0000
@@ -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 -r 3da658984142 -r 417266fac66f databases/postgresql-client/Makefile
--- a/databases/postgresql-client/Makefile      Thu Sep 18 14:45:23 2003 +0000
+++ b/databases/postgresql-client/Makefile      Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
        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 -r 3da658984142 -r 417266fac66f databases/postgresql-docs/Makefile
--- a/databases/postgresql-docs/Makefile        Thu Sep 18 14:45:23 2003 +0000
+++ b/databases/postgresql-docs/Makefile        Thu Sep 18 16:25:08 2003 +0000
@@ -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 -r 3da658984142 -r 417266fac66f databases/postgresql-lib/Makefile
--- a/databases/postgresql-lib/Makefile Thu Sep 18 14:45:23 2003 +0000
+++ b/databases/postgresql-lib/Makefile Thu Sep 18 16:25:08 2003 +0000
@@ -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 -r 3da658984142 -r 417266fac66f databases/postgresql-server/Makefile
--- a/databases/postgresql-server/Makefile      Thu Sep 18 14:45:23 2003 +0000
+++ b/databases/postgresql-server/Makefile      Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 # 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 @@
        ${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 -r 3da658984142 -r 417266fac66f devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Thu Sep 18 14:45:23 2003 +0000
+++ b/devel/libtool-base/Makefile       Thu Sep 18 16:25:08 2003 +0000
@@ -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 -r 3da658984142 -r 417266fac66f devel/libtool-info/Makefile
--- a/devel/libtool-info/Makefile       Thu Sep 18 14:45:23 2003 +0000
+++ b/devel/libtool-info/Makefile       Thu Sep 18 16:25:08 2003 +0000
@@ -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 -r 3da658984142 -r 417266fac66f emulators/suse_audio/Makefile
--- a/emulators/suse_audio/Makefile     Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_audio/Makefile     Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 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 @@
 
 RPMFILES=              ${DISTNAME}${EXTRACT_SUFX}
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 3da658984142 -r 417266fac66f emulators/suse_base/Makefile
--- a/emulators/suse_base/Makefile      Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_base/Makefile      Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 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 @@
        ${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 -r 3da658984142 -r 417266fac66f emulators/suse_compat/Makefile
--- a/emulators/suse_compat/Makefile    Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_compat/Makefile    Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 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 @@
 
 RPMFILES=              ${DISTNAME}${EXTRACT_SUFX}
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 3da658984142 -r 417266fac66f emulators/suse_glx/Makefile
--- a/emulators/suse_glx/Makefile       Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_glx/Makefile       Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 
 RPMFILES=              ${DISTNAME}${EXTRACT_SUFX}
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 3da658984142 -r 417266fac66f emulators/suse_gtk/Makefile
--- a/emulators/suse_gtk/Makefile       Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_gtk/Makefile       Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 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 @@
 
 RPMFILES=              glib.rpm gtk.rpm
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 3da658984142 -r 417266fac66f emulators/suse_libc5/Makefile
--- a/emulators/suse_libc5/Makefile     Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_libc5/Makefile     Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 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 @@
 
 RPMFILES=              ${DISTNAME}${EXTRACT_SUFX}
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 3da658984142 -r 417266fac66f emulators/suse_libjpeg/Makefile
--- a/emulators/suse_libjpeg/Makefile   Thu Sep 18 14:45:23 2003 +0000
+++ b/emulators/suse_libjpeg/Makefile   Thu Sep 18 16:25:08 2003 +0000
@@ -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 @@
 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
Prev by Date: [pkgsrc/trunk]: pkgsrc/fonts/bakoma-fonts Explain how to install the fonts sy...
Next by Date: [pkgsrc/trunk]: pkgsrc Add missing ../ in path to included file.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/fonts/bakoma-fonts Explain how to install the fonts sy...
Next by Thread: [pkgsrc/trunk]: pkgsrc Add missing ../ in path to included file.
Indexes:
Home | Main Index | Thread Index | Old Index