diff options
Diffstat (limited to 'sysutils/mtools/patches/patch-ab')
| -rw-r--r-- | sysutils/mtools/patches/patch-ab | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab index 865b31fc88e..f5bf03278ce 100644 --- a/sysutils/mtools/patches/patch-ab +++ b/sysutils/mtools/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $ +$NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $ ---- configure.orig 2000-05-28 12:22:06.000000000 +0200 -+++ configure 2003-05-22 17:57:40.000000000 +0200 -@@ -2626,7 +2626,7 @@ +--- configure.orig 2003-02-16 11:06:45.000000000 +0000 ++++ configure +@@ -5202,7 +5202,7 @@ if [ $host_os3 = hpux ] ; then fi @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $ LDFLAGS="$LDFLAGS -z" fi -@@ -2908,7 +2908,7 @@ +@@ -5471,7 +5471,7 @@ else # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then @@ -19,37 +19,40 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $ + X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in -@@ -3443,7 +3443,7 @@ + case `(uname -sr) 2>/dev/null` in +@@ -6337,7 +6337,7 @@ fi # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" + ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. -@@ -3644,6 +3644,7 @@ +@@ -6722,6 +6722,8 @@ if test X$use_floppyd = Xyes; then fi FLOPPYD="floppyd floppyd_installtest" BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest" + MANFLOPPYD="floppyd.1" - cat >> confdefs.h <<\EOF ++ MANFLOPPYD_INSTTEST="floppyd_installtest.1" + + cat >>confdefs.h <<\_ACEOF #define USE_FLOPPYD 1 - EOF -@@ -3651,6 +3652,7 @@ +@@ -6730,6 +6732,8 @@ _ACEOF else FLOPPYD= BINFLOPPYD= + MANFLOPPYD= ++ MANFLOPPYD_INSTTEST= fi -@@ -3823,6 +3825,7 @@ - s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g - s%@FLOPPYD@%$FLOPPYD%g - s%@BINFLOPPYD@%$BINFLOPPYD%g +@@ -7327,6 +7331,8 @@ s,@X_LIBS@,$X_LIBS,;t t + s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t + s,@FLOPPYD@,$FLOPPYD,;t t + s,@BINFLOPPYD@,$BINFLOPPYD,;t t +s%@MANFLOPPYD@%$MANFLOPPYD%g - s%@extraincludedir@%$extraincludedir%g - s%@extralibdir@%$extralibdir%g - s%@MACHDEPLIBS@%$MACHDEPLIBS%g ++s%@MANFLOPPYD_INSTTEST@%$MANFLOPPYD_INSTTEST%g + s,@extraincludedir@,$extraincludedir,;t t + s,@extralibdir@,$extralibdir,;t t + s,@MACHDEPLIBS@,$MACHDEPLIBS,;t t |