upgrade to xmame 0.58.2

xmame/xmame.spec

@@ -32,7 +32,7 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Games
 License:      GPL
-Version:      0.57.1
+Version:      0.58.2
 Release:      20020206
 
 #   list of sources
@@ -42,8 +42,8 @@ Source1:      http://www.mame.net/zips/hsdat7.zip
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, make, zlib
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20020206, X11, gcc, make, zlib
+PreReq:       OpenPKG, openpkg >= 20020206, X11
 AutoReq:      no
 AutoReqProv:  no
 
@@ -58,23 +58,24 @@ AutoReqProv:  no
 %build
     os=""
     cpu=""
-    x11=""
     case "%{l_target}" in
-        *-freebsd* ) os="freebsd"; cpu="i386"; x11="X11R6"   ;;
-        *-linux*   ) os="linux";   cpu="i386"; x11="X11R6"   ;;
-        *-solaris* ) os="solaris"; cpu="risc"; x11="openwin" ;;
+        *-freebsd* ) os="freebsd"; cpu="i386" ;;
+        *-linux*   ) os="linux";   cpu="i386" ;;
+        *-solaris* ) os="solaris"; cpu="risc" ;;
     esac
+    x11_inc=`%{l_prefix}/etc/rc --query x11_incdir`
+    x11_lib=`%{l_prefix}/etc/rc --query x11_libdir`
     %{l_make} %{l_mflags -O} \
         -f makefile.unix \
         CC="%{l_cc}" \
-        CFLAGS="-I%{l_prefix}/include -I/usr/$x11/include -pipe -O2 -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math" \
-        LDFLAGS="-L%{l_prefix}/lib -L/usr/$x11/lib" \
+        CFLAGS="-I%{l_prefix}/include -I$x11_inc -pipe -O2 -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math" \
+        LDFLAGS="-L%{l_prefix}/lib -L$x11_lib" \
         PREFIX="%{l_prefix}" \
         XMAMEROOT="%{l_prefix}/etc/xmame" \
         ARCH="$os" \
         MY_CPU="$cpu" \
-        X11INC="-I/usr/$x11/include" \
-        X11LIB="-L/usr/$x11/lib" \
+        X11INC="-I$x11_inc" \
+        X11LIB="-L$x11_lib" \
         LIBS="-L%{l_prefix}/lib" \
         INCLUDE="-I%{l_prefix}/include"