Split patch-af into two (one for each file).

Add some "-Wl,-R"s to get working on ELF.

3 files changed, 38 insertions, 14 deletions

diff --git a/x11/fvwm95/patches/patch-af b/x11/fvwm95/patches/patch-af
index 643425580e8..559ac215e29 100644
--- a/x11/fvwm95/patches/patch-af
+++ b/x11/fvwm95/patches/patch-af
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.3 1998/08/07 11:18:05 agc Exp $
+$NetBSD: patch-af,v 1.4 2000/01/11 01:08:24 simonb Exp $
 
---- configure.orig	Tue Dec 10 17:55:16 1996
-+++ configure	Wed Mar 25 00:22:14 1998
+--- configure.orig	Wed Dec 11 03:55:16 1996
++++ configure	Tue Jan 11 10:23:21 2000
+@@ -2126,7 +2126,7 @@
+ fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons"
+ 
+ if test "x$x_libraries" != x ; then
+-  x_libraries="-L$x_libraries"
++  x_libraries="-L$x_libraries -Wl,-R$x_libraries"
+ fi
+ if test "x$x_includes" != x ; then
+   x_includes="-I$x_includes"
 @@ -2247,7 +2247,6 @@
            libs/Makefile \
            mini-icons/Makefile \
@@ -18,14 +27,3 @@ $NetBSD: patch-af,v 1.3 1998/08/07 11:18:05 agc Exp $
            sample.fvwmrc/Makefile \
            modules/Makefile \
            modules/FvwmAudio/Makefile \
---- Makefile.in.orig	Tue Jun 25 18:26:47 1996
-+++ Makefile.in	Wed Mar 25 00:21:32 1998
-@@ -10,7 +10,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--subdirs=libs fvwm modules utils sample.fvwmrc xpmroot icons mini-icons
-+subdirs=libs fvwm modules utils sample.fvwmrc icons mini-icons
- 
- CFLAGS = -O
- 
diff --git a/x11/fvwm95/patches/patch-ag b/x11/fvwm95/patches/patch-ag
new file mode 100644
index 00000000000..ab4961a6316
--- /dev/null
+++ b/x11/fvwm95/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2000/01/11 01:08:24 simonb Exp $
+
+--- Makefile.in.orig	Wed Jun 26 02:26:47 1996
++++ Makefile.in	Tue Jan 11 10:04:41 2000
+@@ -10,7 +10,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-subdirs=libs fvwm modules utils sample.fvwmrc xpmroot icons mini-icons
++subdirs=libs fvwm modules utils sample.fvwmrc icons mini-icons
+ 
+ CFLAGS = -O
+ 
diff --git a/x11/fvwm95/patches/patch-ah b/x11/fvwm95/patches/patch-ah
new file mode 100644
index 00000000000..631567c97b6
--- /dev/null
+++ b/x11/fvwm95/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2000/01/11 01:08:25 simonb Exp $
+
+--- modules/FvwmAudio/Makefile.in.orig	Tue Jan 11 10:27:14 2000
++++ modules/FvwmAudio/Makefile.in	Tue Jan 11 11:55:19 2000
+@@ -26,7 +26,7 @@
+ XEXT_LIBRARY=-lXext
+ FVWM_LIBRARY=-l${fvwm_name}
+ RPLAY_LIBRARY=-lrplay
+-LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
++LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} -Wl,-R${libdir} ${RPLAY_LIBRARY}
+ 
+ EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
+ CC=@CC@