diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rwxr-xr-x | pkgtools/xpkgwedge/DEINSTALL | 7 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/INSTALL | 17 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/xpkgwedge.def | 6 |
5 files changed, 27 insertions, 12 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index ec91557ebe1..e9811b1aad7 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -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 @@ Changes to the packages collection and infrastructure in 2003: 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 --git a/pkgtools/xpkgwedge/DEINSTALL b/pkgtools/xpkgwedge/DEINSTALL index 739143284b0..87e99b91af6 100755 --- a/pkgtools/xpkgwedge/DEINSTALL +++ b/pkgtools/xpkgwedge/DEINSTALL @@ -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 @@ POST-DEINSTALL) ${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 --git a/pkgtools/xpkgwedge/INSTALL b/pkgtools/xpkgwedge/INSTALL index f8567223b12..29c3929810f 100644 --- a/pkgtools/xpkgwedge/INSTALL +++ b/pkgtools/xpkgwedge/INSTALL @@ -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 @@ POST-INSTALL) ) > ${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 --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 7e04ba6c38c..60e1e82eb72 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -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 @@ MAINTAINER= jlam@NetBSD.org 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 --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def index 70d39eda0fb..071082d3f3a 100644 --- a/pkgtools/xpkgwedge/files/xpkgwedge.def +++ b/pkgtools/xpkgwedge/files/xpkgwedge.def @@ -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 |