diff options
author | jlam <jlam@pkgsrc.org> | 2000-09-13 20:21:53 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2000-09-13 20:21:53 +0000 |
commit | e08034b16f983676483a2f01210632d81308e667 (patch) | |
tree | ba50265d9deb33fd4284c188efbb92edfbc23a25 /x11 | |
parent | 90782f4c213eacc81c6f9683ef5b0d92b75ad698 (diff) | |
download | pkgsrc-e08034b16f983676483a2f01210632d81308e667.tar.gz |
Make this work with xpkgwedge:
* Move installation of config files to ${PREFIX}/lib/X11/xview
(consistent with how lesstif installs into ${PREFIX}/lib/X11/lesstif)
* Provide a xmkmf-type script called "xvmkmf" which does the right thing
for programs needing to generate Makefiles from Imakefiles using XView.
* Bump version number to 3.2.1nb1.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xview-config/Makefile | 15 | ||||
-rw-r--r-- | x11/xview-config/files/patch-sum | 8 | ||||
-rw-r--r-- | x11/xview-config/files/xvmkmf.in | 62 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-aa | 10 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ab | 4 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ac | 2 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ad | 2 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ae | 23 | ||||
-rw-r--r-- | x11/xview-config/pkg/PLIST | 15 |
9 files changed, 115 insertions, 26 deletions
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile index e778611b59e..8bfa28a0c37 100644 --- a/x11/xview-config/Makefile +++ b/x11/xview-config/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2000/09/13 15:19:38 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2000/09/13 20:21:53 jlam Exp $ # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp # DISTNAME= xview3.2p1-X11R6 -PKGNAME= xview-config-3.2.1 +PKGNAME= xview-config-3.2.1nb1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -14,9 +14,18 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL EXTRACT_ELEMENTS= ${DISTNAME}/config WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} USE_IMAKE= # defined -NO_BUILD= # defined + +XVCONFIGDIR= ${PREFIX}/lib/X11/xview post-extract: @${CHMOD} -R go+rX ${WRKDIR} +do-build: + ${SED} -e "s,@X11BASE@,${X11BASE},g" \ + -e "s,@XVCONFIGDIR@,${XVCONFIGDIR},g" \ + < ${FILESDIR}/xvmkmf.in > ${WRKDIR}/xvmkmf + +post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/xvmkmf ${PREFIX}/bin + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xview-config/files/patch-sum b/x11/xview-config/files/patch-sum index 9f27d6c61e9..d81735811ea 100644 --- a/x11/xview-config/files/patch-sum +++ b/x11/xview-config/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.4 2000/09/13 15:30:48 jlam Exp $ +$NetBSD: patch-sum,v 1.5 2000/09/13 20:21:53 jlam Exp $ -MD5 (patch-aa) = 27c7e83f17c98c0bc37a869901db40f8 -MD5 (patch-ab) = d0a4a0a4a24e3402b00a263a54bc3dcb +MD5 (patch-aa) = 9426cb2bce4bce1907e81daff809409f +MD5 (patch-ab) = 3e37659398503fb8fb47a7073d26a748 MD5 (patch-ac) = 94eeec3a337036aeef91ef913925dd96 MD5 (patch-ad) = eb18151caf86ca6fa9bb120d77f334de -MD5 (patch-ae) = d5cd5434956952d43683ffef40d37614 +MD5 (patch-ae) = ee452a334bb230d729f075665a877097 diff --git a/x11/xview-config/files/xvmkmf.in b/x11/xview-config/files/xvmkmf.in new file mode 100644 index 00000000000..5723a882694 --- /dev/null +++ b/x11/xview-config/files/xvmkmf.in @@ -0,0 +1,62 @@ +#!/bin/sh +# +# XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws +# +# $NetBSD: xvmkmf.in,v 1.1 2000/09/13 20:21:53 jlam Exp $ +# +# make a Makefile from an Imakefile from inside or outside the sources +# with support for XView + +usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" + +X11BASE=@X11BASE@ +XVCONFIGDIR=@XVCONFIGDIR@ +configdirspec="-I${X11BASE}/lib/X11/config -I${XVCONFIGDIR}" +topdir= +curdir=. +do_all= + +case "$1" in +-a) + do_all="yes" + shift + ;; +esac + +case $# in + 0) ;; + 1) topdir=$1 ;; + 2) topdir=$1 curdir=$2 ;; + *) echo "$usage" 1>&2; exit 1 ;; +esac + +case "$topdir" in + -*) echo "$usage" 1>&2; exit 1 ;; +esac + +if [ -f Makefile ]; then + echo mv -f Makefile Makefile.bak + mv -f Makefile Makefile.bak +fi + +if [ "$topdir" = "" ]; then + args="-DUseInstalled "$configdirspec +else + args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" +fi + +echo imake $args +case "$do_all" in +yes) + imake $args && + echo "make Makefiles" && + make Makefiles && + echo "make includes" && + make includes && + echo "make depend" && + make depend + ;; +*) + imake $args + ;; +esac diff --git a/x11/xview-config/patches/patch-aa b/x11/xview-config/patches/patch-aa index db19781c1b1..332f8683265 100644 --- a/x11/xview-config/patches/patch-aa +++ b/x11/xview-config/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2000/09/13 15:30:25 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2000/09/13 20:21:54 jlam Exp $ --- Imakefile.orig Tue Jun 29 01:13:19 1993 +++ Imakefile -@@ -8,7 +8,7 @@ +@@ -8,10 +8,10 @@ /**/# config directory /**/# @(#)Imakefile 1.9 28 Jun 1993 SMI @@ -10,4 +10,8 @@ $NetBSD: patch-aa,v 1.3 2000/09/13 15:30:25 jlam Exp $ +XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog CFFILES = $(XVFILES) $(HEADERS) - InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS)) +-InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS)) ++InstallMultipleDestFlags(install,$(CFFILES),$(XVCONFIGDIR),$(INSTDATFLAGS)) + + depend:: + diff --git a/x11/xview-config/patches/patch-ab b/x11/xview-config/patches/patch-ab index 6a819d7eb66..468002d36fa 100644 --- a/x11/xview-config/patches/patch-ab +++ b/x11/xview-config/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2000/09/13 15:30:26 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2000/09/13 20:21:54 jlam Exp $ --- XView.cf.orig Sun Jun 26 22:09:19 1994 +++ XView.cf @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2000/09/13 15:30:26 jlam Exp $ */ #ifndef XVDestDir -#define XVDestDir /usr/X11/xview -+#define XVDestDir /usr/X11R6 ++#define XVDestDir ProjectRoot #endif /* * Command to add object modules to the library. diff --git a/x11/xview-config/patches/patch-ac b/x11/xview-config/patches/patch-ac index 116193cf3ce..84a0d896b6e 100644 --- a/x11/xview-config/patches/patch-ac +++ b/x11/xview-config/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2000/09/13 15:30:26 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2000/09/13 20:21:54 jlam Exp $ --- XView.obj.orig Tue Jun 29 01:13:20 1993 +++ XView.obj diff --git a/x11/xview-config/patches/patch-ad b/x11/xview-config/patches/patch-ad index 4cfdfcb8f19..20d5ec10373 100644 --- a/x11/xview-config/patches/patch-ad +++ b/x11/xview-config/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2000/09/13 15:30:26 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $ --- XView.rules.orig Tue Jun 29 01:13:20 1993 +++ XView.rules diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae index b900e20200e..622307ebd51 100644 --- a/x11/xview-config/patches/patch-ae +++ b/x11/xview-config/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 2000/09/13 15:30:26 jlam Exp $ +$NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $ --- XView.tmpl.orig Sun Jun 26 22:10:00 1994 +++ XView.tmpl @@ -11,7 +11,20 @@ $NetBSD: patch-ae,v 1.3 2000/09/13 15:30:26 jlam Exp $ #endif #if OsHasLocale -@@ -192,14 +192,6 @@ +@@ -158,6 +158,12 @@ + # endif + CONFIGDIR = XVConfigdir + #endif ++/* ++ * Set the config directory for XView and add this directory to ++ * the places imake searches for config files. ++ */ ++ XVCONFIGDIR = $(XVDESTDIR)/lib/X11/xview ++ IMAKE_DEFINES += -I$(XVCONFIGDIR) + + XVLIBSRC = $(TOP)/lib + HELP_DEST = XVHelpDest +@@ -192,14 +198,6 @@ AS = as */ /* @@ -26,7 +39,7 @@ $NetBSD: patch-ae,v 1.3 2000/09/13 15:30:26 jlam Exp $ * Temporary directory used during build process before the include * files are installed. This is just a place where symbolic links are * placed to point back to the actual files in the build hierarchy to -@@ -224,7 +216,7 @@ +@@ -224,7 +222,7 @@ * afterwards. */ #ifndef XVIncludeDirName @@ -35,7 +48,7 @@ $NetBSD: patch-ae,v 1.3 2000/09/13 15:30:26 jlam Exp $ #endif INCDIR = XVIncludeDirName /* -@@ -356,10 +348,10 @@ +@@ -356,10 +354,10 @@ #if SystemV4 SYSV_CLIENT_LIB = -lintl -ldl @@ -48,7 +61,7 @@ $NetBSD: patch-ae,v 1.3 2000/09/13 15:30:26 jlam Exp $ #endif /* -@@ -371,16 +363,16 @@ +@@ -371,16 +369,16 @@ */ #if XvI18nLevel == 4 diff --git a/x11/xview-config/pkg/PLIST b/x11/xview-config/pkg/PLIST index c3d924dc62c..0a9f15f9e63 100644 --- a/x11/xview-config/pkg/PLIST +++ b/x11/xview-config/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 1998/07/03 20:59:29 tron Exp $ -lib/X11/config/XView.cf -lib/X11/config/XView.lib -lib/X11/config/XView.obj -lib/X11/config/XView.rules -lib/X11/config/XView.tmpl -lib/X11/config/XView.prog +@comment $NetBSD: PLIST,v 1.3 2000/09/13 20:21:55 jlam Exp $ +bin/xvmkmf +lib/X11/xview/XView.cf +lib/X11/xview/XView.lib +lib/X11/xview/XView.obj +lib/X11/xview/XView.prog +lib/X11/xview/XView.rules +lib/X11/xview/XView.tmpl |