[pkgsrc/trunk]: pkgsrc Add handling for OpenWin on Solaris. Two files are pat...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cb3db755184
branches:  trunk
changeset: 461090:6cb3db755184
user:      gavan <gavan%pkgsrc.org@localhost>
date:      Wed Sep 10 17:31:40 2003 +0000

description:
Add handling for OpenWin on Solaris. Two files are patched with
sed at install time which override the versions in the /usr/openwin
tree.

PREFIX no longer has a default value, as this relied on nonportable
BSD make syntax. Makefiles generated with pkgxmkmf will now always
need PREFIX set in the environment.

diffstat:

 doc/CHANGES                            |   3 ++-
 pkgtools/xpkgwedge/DEINSTALL           |   7 ++++++-
 pkgtools/xpkgwedge/INSTALL             |  17 ++++++++++++++++-
 pkgtools/xpkgwedge/Makefile            |   6 ++----
 pkgtools/xpkgwedge/files/xpkgwedge.def |   6 +-----
 5 files changed, 27 insertions(+), 12 deletions(-)

diffs (125 lines):

diff -r cbbe72db5fce -r 6cb3db755184 doc/CHANGES
--- a/doc/CHANGES       Wed Sep 10 16:49:14 2003 +0000
+++ b/doc/CHANGES       Wed Sep 10 17:31:40 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3314 2003/09/10 16:49:14 taca Exp $
+$NetBSD: CHANGES,v 1.3315 2003/09/10 17:31:40 gavan Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3613,3 +3613,4 @@
        Updated ruby-DBI to 0.0.21 [taca 2003-09-10]
        Updated ruby-DBD-postgresql to 0.0.21 [taca 2003-09-10]
        Added ruby-DBD-mysql-0.0.21 [taca 2003-09-10]
+       Updated xpkgwedge to 1.8 [gavan 2003-09-10]
diff -r cbbe72db5fce -r 6cb3db755184 pkgtools/xpkgwedge/DEINSTALL
--- a/pkgtools/xpkgwedge/DEINSTALL      Wed Sep 10 16:49:14 2003 +0000
+++ b/pkgtools/xpkgwedge/DEINSTALL      Wed Sep 10 17:31:40 2003 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: DEINSTALL,v 1.3 2003/08/30 11:08:22 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2003/09/10 17:31:43 gavan Exp $
 
 FONT_PROGS="@FONT_PROGS@"
 X11BASE=@X11BASE@
 
 X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
 HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
+SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
+SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
 
 case ${STAGE} in
 POST-DEINSTALL)
@@ -23,6 +25,9 @@
           ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}; then
                ${RM} -f ${HOSTDEF}
        fi
+       case ${X11BASE} in
+               *openwin) ${RM} -f ${SITEDEF} ${SV4LIB} ;;
+       esac
        ${ECHO} "done."
        ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
        ;;
diff -r cbbe72db5fce -r 6cb3db755184 pkgtools/xpkgwedge/INSTALL
--- a/pkgtools/xpkgwedge/INSTALL        Wed Sep 10 16:49:14 2003 +0000
+++ b/pkgtools/xpkgwedge/INSTALL        Wed Sep 10 17:31:40 2003 +0000
@@ -1,10 +1,18 @@
-# $NetBSD: INSTALL,v 1.4 2003/08/30 11:08:22 jlam Exp $
+# $NetBSD: INSTALL,v 1.5 2003/09/10 17:31:43 gavan Exp $
 
 FONT_PROGS="@FONT_PROGS@"
 X11BASE=@X11BASE@
 
 X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
 HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
+X11_SITEDEF=${X11BASE}/lib/X11/config/site.def
+SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
+X11_SV4LIB=${X11BASE}/lib/X11/config/sv4Lib.tmpl
+SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
+
+SV4LIB_SUBST_SED="-e s/^       /        /"
+SITEDEF_SUBST_SED="-e s/\#endif.*VendorCF.*/\#include <host.def>\\
+&/"
 
 case ${STAGE} in
 POST-INSTALL)
@@ -32,5 +40,12 @@
        ) > ${HOSTDEF}
        ${RM} -f ${HOSTDEF}.bak
        ${ECHO} "done."
+       case ${X11BASE} in
+               *openwin) ${ECHO} -n "Patching OpenWindows templates..."
+                         ${SED} "${SITEDEF_SUBST_SED}" ${X11_SITEDEF} > ${SITEDEF}
+                         ${SED} "${SV4LIB_SUBST_SED}" ${X11_SV4LIB} > ${SV4LIB}
+                         ${ECHO} "done."
+                         ;;
+       esac
        ;;
 esac
diff -r cbbe72db5fce -r 6cb3db755184 pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Wed Sep 10 16:49:14 2003 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Wed Sep 10 17:31:40 2003 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:29 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2003/09/10 17:31:43 gavan Exp $
 
-DISTNAME=      xpkgwedge-1.7
+DISTNAME=      xpkgwedge-1.8
 WRKSRC=                ${WRKDIR}
 CATEGORIES=    pkgtools devel x11
 MASTER_SITES=  # empty
@@ -10,8 +10,6 @@
 HOMEPAGE=      ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
 COMMENT=       Allows X11 pkgs to be built and used outside of /usr/X11R6
 
-NOT_FOR_PLATFORM=      SunOS-*-*
-
 EXTRACT_ONLY=  # empty
 NO_CONFIGURE=  # defined
 NO_BUILDLINK=  # defined
diff -r cbbe72db5fce -r 6cb3db755184 pkgtools/xpkgwedge/files/xpkgwedge.def
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def    Wed Sep 10 16:49:14 2003 +0000
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def    Wed Sep 10 17:31:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xpkgwedge.def,v 1.8 2001/07/02 21:03:02 jlam Exp $     */
+/*     $NetBSD: xpkgwedge.def,v 1.9 2003/09/10 17:31:44 gavan Exp $    */
 
 #ifdef AfterVendorCF
 
@@ -6,9 +6,6 @@
  * The following defines inject a "PREFIX=" make-time option that lets the
  * user twiddle the ProjectRoot setting with a single switch.  This makes
  * the command "make PREFIX=/path/to/install all install" work as expected.
- *
- * Note that ?= is a special Pmake construct and probably will not work on
- * other makes.
  */
 
 #ifndef ProjectRoot
@@ -19,7 +16,6 @@
 #define ProjectRoot /usr/X11
 #endif
 
-PREFIX ?= ProjectRoot
 X11_ROOT = ProjectRoot
 
 #undef ProjectRoot