[pkgsrc/trunk]: pkgsrc Move zlib SUBST magic to Makefile.common, it is always...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07bad70cac6b
branches:  trunk
changeset: 516624:07bad70cac6b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jul 24 14:11:13 2006 +0000

description:
Move zlib SUBST magic to Makefile.common, it is always needed.
Fixes problems found by abs@

diffstat:

 meta-pkgs/xorg/Makefile.common |  9 ++++++++-
 x11/xorg-libs/Makefile         |  9 +--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r a1be7d829317 -r 07bad70cac6b meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Mon Jul 24 13:58:11 2006 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Mon Jul 24 14:11:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2006/07/04 09:20:18 rillig Exp $
+# $NetBSD: Makefile.common,v 1.42 2006/07/24 14:11:13 joerg Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will
 #   be built in.
@@ -221,6 +221,13 @@
 .  endif
 .endif
 
+SUBST_CLASSES+=                zlib
+SUBST_STAGE.zlib=      pre-configure
+SUBST_FILES.zlib=      config/cf/Imake.tmpl
+SUBST_SED.zlib=                -e 's|@ZLIBDIR@|${BUILDLINK_PREFIX.zlib}/lib|g' \
+                       -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
+SUBST_MESSAGE.zlib=    Adding the zlib library path.
+
 USE_LANGUAGES=         c c++
 
 .  if !target(post-extract)
diff -r a1be7d829317 -r 07bad70cac6b x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Mon Jul 24 13:58:11 2006 +0000
+++ b/x11/xorg-libs/Makefile    Mon Jul 24 14:11:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/07/23 15:45:36 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2006/07/24 14:11:13 joerg Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
@@ -49,13 +49,6 @@
 SUBST_SED.mkstrs=      -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
 SUBST_MESSAGE.mkstrs=  Fixing path of makestrs.
 
-SUBST_CLASSES+=                zlib
-SUBST_STAGE.zlib=      pre-configure
-SUBST_FILES.zlib=      config/cf/Imake.tmpl
-SUBST_SED.zlib=                -e 's|@ZLIBDIR@|${BUILDLINK_PREFIX.zlib}/lib|g' \
-                       -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
-SUBST_MESSAGE.zlib=    Adding the zlib library path.
-
 post-install:
        @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if ${OPSYS} == "Linux"