diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-09-28 02:30:18 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-09-28 02:30:18 +0000 |
| commit | e21990b7a753baf64d51ea4cdc9da5121bcc357e (patch) | |
| tree | c04a8c0cda8fb6c33f6f43f21ed21b3dd40f146e /games/xshisen | |
| parent | Escape the '@' character so that perl in -current doesn't choke. (diff) | |
Fix build for ELF.
Diffstat (limited to 'games/xshisen')
| -rw-r--r-- | games/xshisen/files/patch-aa | 124 |
1 files changed, 55 insertions, 69 deletions
diff --git a/games/xshisen/files/patch-aa b/games/xshisen/files/patch-aa index 0da6d3e00e28..91bf2f8fcec1 100644 --- a/games/xshisen/files/patch-aa +++ b/games/xshisen/files/patch-aa @@ -1,69 +1,55 @@ -*** configure.orig Tue Feb 27 21:29:29 1996 ---- configure Sat Feb 22 23:12:20 1997 -*************** -*** 9,17 **** - - # Defaults: - ac_help= -! ac_default_prefix=/usr/local - # Any additions from configure.in: -! ac_default_prefix=/usr/local - ac_help="$ac_help - --with-x use the X Window System" - ac_help="$ac_help ---- 9,17 ---- - - # Defaults: - ac_help= -! ac_default_prefix=/usr/X11R6 - # Any additions from configure.in: -! ac_default_prefix=/usr/X11R6 - ac_help="$ac_help - --with-x use the X Window System" - ac_help="$ac_help -*************** -*** 53,59 **** - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' -! datadir='${prefix}/share' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' ---- 53,59 ---- - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' -! datadir='${prefix}/lib/X11' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -*************** -*** 1577,1589 **** - - - # Check whether --enable-japanese or --disable-japanese was given. -! if test "${enable_japanese+set}" = set; then -! enableval="$enable_japanese" -! cat >> confdefs.h <<EOF - #define KANJICODE "${enable_japanese}" -! EOF - -! fi - - - cat >> confdefs.h <<\EOF ---- 1577,1589 ---- - - - # Check whether --enable-japanese or --disable-japanese was given. -! #if test "${enable_japanese+set}" = set; then -! # enableval="$enable_japanese" -! # cat >> confdefs.h <<EOF - #define KANJICODE "${enable_japanese}" -! #EOF - -! #fi - - - cat >> confdefs.h <<\EOF +--- configure.orig Tue Feb 27 06:29:29 1996 ++++ configure Sun Sep 27 16:15:59 1998 +@@ -9,9 +9,9 @@ + + # Defaults: + ac_help= +-ac_default_prefix=/usr/local ++ac_default_prefix=/usr/X11R6 + # Any additions from configure.in: +-ac_default_prefix=/usr/local ++ac_default_prefix=/usr/X11R6 + ac_help="$ac_help + --with-x use the X Window System" + ac_help="$ac_help +@@ -53,7 +53,7 @@ + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datadir='${prefix}/lib/X11' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +@@ -1370,7 +1370,11 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- LIBS="-lXt -lX11 $LIBS" ++ if [ "$PORTOBJFORMAT" = "elf" ]; then ++ LIBS="-lXpm -lXaw -lXt -lX11 $LIBS" ++ else ++ LIBS="-lXt -lX11 $LIBS" ++ fi + else + echo "$ac_t""no" 1>&6 + fi +@@ -1577,13 +1581,13 @@ + + + # Check whether --enable-japanese or --disable-japanese was given. +-if test "${enable_japanese+set}" = set; then +- enableval="$enable_japanese" +- cat >> confdefs.h <<EOF ++#if test "${enable_japanese+set}" = set; then ++# enableval="$enable_japanese" ++# cat >> confdefs.h <<EOF + #define KANJICODE "${enable_japanese}" +-EOF ++#EOF + +-fi ++#fi + + + cat >> confdefs.h <<\EOF |