summaryrefslogtreecommitdiff
path: root/x11/xview-config/patches/patch-ae
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-05-02 21:46:07 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-05-02 21:46:07 +0000
commit51b94997c04e8a14a84865e1d8e3c6b81182c84b (patch)
tree2a79da2b4cb15a0f9e393895a397e504f5a67d1c /x11/xview-config/patches/patch-ae
parent97653fb72ba56aced206a3127d884ad76152e838 (diff)
downloadpkgsrc-51b94997c04e8a14a84865e1d8e3c6b81182c84b.tar.gz
Fix on powerpc. Patches provided by Andrew Cagney <cagney@tpgi.com.au>
in PR pkg/12803 and integrated by me. It also now compiles on alpha but segfaults there so change the broken message accordingly.
Diffstat (limited to 'x11/xview-config/patches/patch-ae')
-rw-r--r--x11/xview-config/patches/patch-ae28
1 files changed, 9 insertions, 19 deletions
diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae
index ff54f3ac180..5e8a3f5bb58 100644
--- a/x11/xview-config/patches/patch-ae
+++ b/x11/xview-config/patches/patch-ae
@@ -1,18 +1,15 @@
-$NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
-
---- XView.tmpl.orig Sun Jun 26 22:10:00 1994
-+++ XView.tmpl
-@@ -96,7 +96,7 @@
- * Work around small conflict with Project.tmpl file
+$NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
+
+--- ./XView.tmpl.orig Sun Jun 26 22:10:00 1994
++++ ./XView.tmpl Tue May 1 22:40:31 2001
+@@ -97,5 +97,5 @@
*/
#if UseInstalled
- MKDIRHIER = BourneShell BinDir/mkdirhier
+ MKDIRHIER = mkdirhier
#endif
- #if OsHasLocale
-@@ -192,14 +192,6 @@
- AS = as
+@@ -193,12 +193,4 @@
*/
/*
- * use the same trick X11R5 does for defining rules for installed libs
@@ -25,18 +22,14 @@ $NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 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 @@
- * afterwards.
+@@ -225,5 +217,5 @@
*/
#ifndef XVIncludeDirName
-#define XVIncludeDirName /include
+#define XVIncludeDirName include
#endif
INCDIR = XVIncludeDirName
- /*
-@@ -356,10 +348,10 @@
-
+@@ -357,8 +349,8 @@
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
- XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
@@ -47,9 +40,7 @@ $NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
+ XVCLIENTSYSDEFINES = -DSUNOS41
#endif
- /*
-@@ -371,16 +363,16 @@
- */
+@@ -372,14 +364,14 @@
#if XvI18nLevel == 4
- XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
@@ -71,4 +62,3 @@ $NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
+ XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
- * Define libraries for XView clients