diff options
| author | frueauf <frueauf@pkgsrc.org> | 1999-01-05 11:34:38 +0000 |
|---|---|---|
| committer | frueauf <frueauf@pkgsrc.org> | 1999-01-05 11:34:38 +0000 |
| commit | 74deead13d3771b21eecc4cb4f7e61d6d587d7be (patch) | |
| tree | 074360dee19065852e35824d8ccda7fb0bf0da62 /x11 | |
| parent | f5d259a17f73fe4dfdbb0e2e751fd5f3a37f0f75 (diff) | |
| download | pkgsrc-74deead13d3771b21eecc4cb4f7e61d6d587d7be.tar.gz | |
For some reason the pmax X11 (1.3.3) needs a forced ordering of libs while
linking, e.g. -Xt before -lSM and -lICE, sometimes even -lXext before -X11.
This rearangment does not affect e.g. i386, so I hope this does not open
problems on other ports. This way xscreensaver works on pmax.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 24 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ab | 13 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ac | 13 |
3 files changed, 50 insertions, 0 deletions
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa new file mode 100644 index 00000000000..5fb151a8934 --- /dev/null +++ b/x11/xscreensaver/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 1999/01/05 11:34:38 frueauf Exp $ + +--- driver/Makefile.in-orig Sun Nov 22 09:00:54 1998 ++++ driver/Makefile.in Tue Jan 5 01:28:35 1999 +@@ -129,15 +129,15 @@ + DEMO_OBJS = $(DEMO_OBJS_1) remote.o \ + $(TOOLKIT_OBJS) $(DEMO_UTIL_OBJS) + +-SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ \ +- $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ ++SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ -lXt \ ++ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \ + $(PASSWD_LIBS) + + CMD_LIBS = $(LIBS) $(X_LIBS) \ + $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) + +-DEMO_LIBS = $(LIBS) $(X_LIBS) $(TOOLKIT_LIBS) \ +- $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) ++DEMO_LIBS = $(LIBS) $(X_LIBS) $(TOOLKIT_LIBS) -lXt \ ++ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) + + EXES = xscreensaver xscreensaver-command xscreensaver-demo + diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab new file mode 100644 index 00000000000..26543110391 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 1999/01/05 11:34:39 frueauf Exp $ + +--- hacks/Makefile.in-orig Sun Nov 22 09:00:56 1998 ++++ hacks/Makefile.in Tue Jan 5 02:17:55 1999 +@@ -41,7 +41,7 @@ + # Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc. + # + HACK_PRE = $(LIBS) $(X_LIBS) +-HACK_POST = $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm ++HACK_POST = -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) -lm + HACK_LIBS = $(HACK_PRE) @HACK_LIBS@ $(HACK_POST) + XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST) + XLOCK_LIBS = $(HACK_LIBS) diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac new file mode 100644 index 00000000000..5fad1813098 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 1999/01/05 11:34:39 frueauf Exp $ + +--- hacks/glx/Makefile.in-orig Sun Nov 22 09:00:58 1998 ++++ hacks/glx/Makefile.in Tue Jan 5 02:26:15 1999 +@@ -41,7 +41,7 @@ + # Note: see comment in ../../driver/Makefile.in for explanation of X_LIBS, etc. + # + HACK_PRE = $(LIBS) $(X_LIBS) +-HACK_POST = $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm ++HACK_POST = -lXt $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm + HACK_LIBS = $(HACK_PRE) @GL_LIBS@ @HACK_LIBS@ $(HACK_POST) + XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ @GL_LIBS@ @HACK_LIBS@ $(HACK_POST) + |