summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2000-10-02 08:05:11 +0000
committerjlam <jlam@pkgsrc.org>2000-10-02 08:05:11 +0000
commit7b953228b834d548dcfc78ecfe5b774d17d83683 (patch)
tree279ad4fb9e221678d44152360f399bd667e8715e /x11
parent9db005df4ea2824694cf584fe2f118fe858ea886 (diff)
downloadpkgsrc-7b953228b834d548dcfc78ecfe5b774d17d83683.tar.gz
Don't pass Ultrix C compiler flags to gcc on NetBSD/alpha.
Diffstat (limited to 'x11')
-rw-r--r--x11/tvtwm/files/patch-sum4
-rw-r--r--x11/tvtwm/patches/patch-aa15
2 files changed, 12 insertions, 7 deletions
diff --git a/x11/tvtwm/files/patch-sum b/x11/tvtwm/files/patch-sum
index 879d6284089..197f465837a 100644
--- a/x11/tvtwm/files/patch-sum
+++ b/x11/tvtwm/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/10/02 08:01:12 jlam Exp $
+$NetBSD: patch-sum,v 1.7 2000/10/02 08:05:11 jlam Exp $
-MD5 (patch-aa) = 14e3d6f232a8de8b7736d8fb00f5b43b
+MD5 (patch-aa) = 7c0fc3433bdad992718dd225e191eab4
MD5 (patch-ad) = e8e46b5564cb6ec6ca7f2118a7c4fe95
MD5 (patch-ae) = b6ba9900002aec7938ff956557c0b0b7
MD5 (patch-af) = 4d004d60e742e3b2d1fccfd0c59b9685
diff --git a/x11/tvtwm/patches/patch-aa b/x11/tvtwm/patches/patch-aa
index e98b1923d12..203acfca8b6 100644
--- a/x11/tvtwm/patches/patch-aa
+++ b/x11/tvtwm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/10/02 08:01:13 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2000/10/02 08:05:11 jlam Exp $
--- Imakefile.orig Thu Feb 2 19:25:44 1995
+++ Imakefile
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 2000/10/02 08:01:13 jlam Exp $
LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
DEFINES = -DSHAPE $(RELEASE_DEFINES) $(LOCAL_DEFINES) $(SIGNAL_DEFINES)
-@@ -93,11 +93,11 @@
+@@ -93,14 +93,15 @@
iconmgr.o cursor.o icons.o vdt.o move.o LocPixmap.o \
regexp.o
@@ -49,8 +49,13 @@ $NetBSD: patch-aa,v 1.3 2000/10/02 08:01:13 jlam Exp $
+SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/X11/bitmaps"')
SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
- #if defined(UltrixArchitecture) || defined(AlphaArchitecture)
-@@ -120,11 +120,12 @@
+-#if defined(UltrixArchitecture) || defined(AlphaArchitecture)
++/* The following rule is only applicable to a specific compiler on Ultrix. */
++#if defined(UltrixArchitecture)
+ SpecialObjectRule(menus.o,NullParameter,-Olimit 700)
+ #endif
+
+@@ -120,11 +121,12 @@
XCOMM ln $(BINDIR)/tvtwm $(BINDIR)/twm
#if (ProjectX < 5)
@@ -66,7 +71,7 @@ $NetBSD: patch-aa,v 1.3 2000/10/02 08:01:13 jlam Exp $
#endif
gram.h gram.c: gram.y
-@@ -135,7 +136,10 @@
+@@ -135,7 +137,10 @@
clean::
$(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c deftwmrc.c