diff options
| author | jlam <jlam@pkgsrc.org> | 2000-09-13 20:24:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-09-13 20:24:37 +0000 |
| commit | 88c8cd24ad577f8e1c5f38295b6166c1583f244d (patch) | |
| tree | 268909a362bdd03ee95a2d9686203d58137a8b8d /x11 | |
| parent | e3027bb0f1b47e568052b903e48bd4cb92192373 (diff) | |
| download | pkgsrc-88c8cd24ad577f8e1c5f38295b6166c1583f244d.tar.gz | |
Make this work with xpkgwedge:
* Don't build/install xgettext and msgfmt as they'll conflict with
devel/gettext.
* Use ${X11PREFIX}/bin/xvmkmf instead of xmkmf to generate Makefiles.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xview-lib/Makefile | 5 | ||||
| -rw-r--r-- | x11/xview-lib/files/patch-sum | 3 | ||||
| -rw-r--r-- | x11/xview-lib/patches/patch-as | 13 | ||||
| -rw-r--r-- | x11/xview-lib/pkg/PLIST | 6 |
4 files changed, 19 insertions, 8 deletions
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index 963ec83b14c..f1680244bff 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/09/13 15:19:39 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2000/09/13 20:24:37 jlam Exp $ # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp # @@ -9,10 +9,11 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= packages@netbsd.org -DEPENDS= xview-config-3.2.1:../../x11/xview-config +DEPENDS= xview-config>=3.2.1:../../x11/xview-config NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL USE_IMAKE= # defined +XMKMF= ${X11PREFIX}/bin/xvmkmf -a .include "../../mk/bsd.pkg.mk" diff --git a/x11/xview-lib/files/patch-sum b/x11/xview-lib/files/patch-sum index 768a9a83bf5..c8cd788a638 100644 --- a/x11/xview-lib/files/patch-sum +++ b/x11/xview-lib/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.4 2000/06/16 14:16:53 pooka Exp $ +$NetBSD: patch-sum,v 1.5 2000/09/13 20:24:38 jlam Exp $ MD5 (patch-aa) = ab481aa246f19a8388743244d331081c MD5 (patch-ab) = 0811acd752078caea8bd851c85ea08dd @@ -17,3 +17,4 @@ MD5 (patch-ao) = 6474d1a6a263ec6ae6bdc21f43ab9bd0 MD5 (patch-ap) = cb81476a736a1b807671b9622fcffc85 MD5 (patch-aq) = c31e3d378c80c89e836d4f31d4998fcc MD5 (patch-ar) = f81fb163a92e9c0e28519c07cf088f81 +MD5 (patch-as) = 760cb7d6f029a2afa560abdceb3364f9 diff --git a/x11/xview-lib/patches/patch-as b/x11/xview-lib/patches/patch-as new file mode 100644 index 00000000000..6e19e4d8fff --- /dev/null +++ b/x11/xview-lib/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2000/09/13 20:24:38 jlam Exp $ + +--- util/Imakefile.orig Tue Jun 29 01:14:22 1993 ++++ util/Imakefile +@@ -16,7 +16,7 @@ + + CONV_DIR = conversion + +-MSG_UTIL = xgettext msgfmt ++#MSG_UTIL = xgettext msgfmt + + SUBDIRS = $(CPP_DIR) $(SOELIM_DIR) $(CONV_DIR) $(MSG_UTIL) + diff --git a/x11/xview-lib/pkg/PLIST b/x11/xview-lib/pkg/PLIST index c6712b54076..e48ff6fa5f1 100644 --- a/x11/xview-lib/pkg/PLIST +++ b/x11/xview-lib/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/07/15 11:08:55 agc Exp $ -bin/xgettext -bin/msgfmt +@comment $NetBSD: PLIST,v 1.5 2000/09/13 20:24:39 jlam Exp $ include/bitmaps/1x1 include/bitmaps/2x2 include/bitmaps/black @@ -293,6 +291,4 @@ lib/help/xview.info lib/help/props.info lib/help/textedit.info @dirrm lib/help -man/cat1/msgfmt.0 -man/cat1/xgettext.0 man/cat1/xview.0 |