[pkgsrc/trunk]: pkgsrc Fix problem where PLIST included shared libraries for ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d0bd9099bb6
branches:  trunk
changeset: 474355:2d0bd9099bb6
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Apr 27 21:49:57 2004 +0000

description:
Fix problem where PLIST included shared libraries for liboldX
for Linux. Also make sure that libpsres.* is installed always.
This is for the XFree86-libs package. PKGREVISION was just bumped in
last, very recent, commit so don't do it again.

diffstat:

 meta-pkgs/XFree86/Makefile.common |  6 +++++-
 x11/XFree86-libs/PLIST            |  8 ++++----
 x11/XFree86-libs/files/host.def   |  4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (81 lines):

diff -r 978c7d39c570 -r 2d0bd9099bb6 meta-pkgs/XFree86/Makefile.common
--- a/meta-pkgs/XFree86/Makefile.common Tue Apr 27 21:39:39 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile.common Tue Apr 27 21:49:57 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2004/04/17 11:10:53 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.9 2004/04/27 21:49:57 reed Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -37,6 +37,7 @@
 STATIC_LIB=
 XF86RUSH=              '@comment '
 I810XVMC=              '@comment '
+LIBOLDX=
 IMAKE_MANTOOLS=
 LIBDRI=
 MANSOURCEPATH=         man/man
@@ -59,6 +60,7 @@
 STATIC_LIB=            '@comment '
 XF86RUSH=
 I810XVMC=
+LIBOLDX=               '@comment '
 USE_GNU_TOOLS+=                make
 IMAKE_MANTOOLS=
 LIBDRI=
@@ -82,6 +84,7 @@
 STATIC_LIB=
 XF86RUSH=              '@comment '
 I810XVMC=              '@comment '
+LIBOLDX=
 IMAKE_MANTOOLS=                '@comment '
 LIBDRI=                        '@comment '
 MANSOURCEPATH=         man/cat
@@ -106,6 +109,7 @@
 PLIST_SUBST+=  STATIC_LIB=${STATIC_LIB}
 PLIST_SUBST+=  XF86RUSH=${XF86RUSH}
 PLIST_SUBST+=  I810XVMC=${I810XVMC}
+PLIST_SUBST+=  LIBOLDX=${LIBOLDX}
 PLIST_SUBST+=  IMAKE_MANTOOLS=${IMAKE_MANTOOLS}
 PLIST_SUBST+=  LIBDRI=${LIBDRI}
 PLIST_SUBST+=  MAN_DIR=${MAN_DIR}
diff -r 978c7d39c570 -r 2d0bd9099bb6 x11/XFree86-libs/PLIST
--- a/x11/XFree86-libs/PLIST    Tue Apr 27 21:39:39 2004 +0000
+++ b/x11/XFree86-libs/PLIST    Tue Apr 27 21:49:57 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2004/03/28 22:11:33 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/27 21:49:57 reed Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -658,9 +658,9 @@
 ${X11ROOT_PREFIX}/lib/libfontenc.so.1
 ${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
 ${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/liboldX.so
-${X11ROOT_PREFIX}/lib/liboldX.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/liboldX.so.6.0
+${LIBOLDX}${X11ROOT_PREFIX}/lib/liboldX.so
+${LIBOLDX}${X11ROOT_PREFIX}/lib/liboldX.so.6
+${LIBOLDX}${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/liboldX.so.6.0
 ${X11ROOT_PREFIX}/lib/libpsres.a
 ${X11ROOT_PREFIX}/lib/libpsres.so
 ${X11ROOT_PREFIX}/lib/libpsres.so.1
diff -r 978c7d39c570 -r 2d0bd9099bb6 x11/XFree86-libs/files/host.def
--- a/x11/XFree86-libs/files/host.def   Tue Apr 27 21:39:39 2004 +0000
+++ b/x11/XFree86-libs/files/host.def   Tue Apr 27 21:49:57 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.3 2004/04/27 21:49:57 reed Exp $ */
 
 #define ProjectRoot @PREFIX@
 
@@ -34,6 +34,8 @@
 #undef  SharedLibXinerama
 #define SharedLibXinerama      YES
 
+#define NormalLibPSRes YES
+
 #define LibInstallBuild  YES
 
 #ifndef DriDrivers