convert to new %{l_platform} world order

dnstracer/dnstracer.spec

@@ -59,7 +59,7 @@ AutoReqProv:  no
 %build
     opts=""
     case "%{l_platform -t}" in
-        *-solaris* ) opts="--disable-ipv6" ;;
+        *-sunos* ) opts="--disable-ipv6" ;;
     esac
     ACLOCAL=true \
     AUTOCONF=true \

doxygen/doxygen.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Text
 License:      GPL
 Version:      1.3.3
-Release:      20030725
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
@@ -41,8 +41,8 @@ Source0:      ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021204, make, flex, bison, perl, gcc
-PreReq:       OpenPKG, openpkg >= 20021204
+BuildPreReq:  OpenPKG, openpkg >= 20030909, make, flex, bison, perl, gcc
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -54,10 +54,10 @@ AutoReqProv:  no
 
 %build
     opt=""
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) opt="--platform freebsd-g++" ;;
         *-linux*   ) opt="--platform linux-g++"   ;;
-        *-solaris* ) opt="--platform solaris-g++" ;;
+        *-sunos*   ) opt="--platform solaris-g++" ;;
     esac
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \

dsniff/dsniff.spec

@@ -49,7 +49,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Network
 License:      BSD-style
 Version:      %{V_dsniff}
-Release:      20030813
+Release:      20030918
 
 #   list of sources
 Source0:      http://www.monkey.org/~dugsong/dsniff/dsniff-%{V_dsniff}.tar.gz
@@ -60,8 +60,8 @@ Patch0:       dsniff.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909
+PreReq:       OpenPKG, openpkg >= 20030909
 BuildPreReq:  db, db::with_compat = yes, openssl, libpcap, libnet, libnids
 PreReq:       db, db::with_compat = yes, openssl, libpcap, libnet, libnids
 AutoReq:      no
@@ -94,7 +94,7 @@ AutoReqProv:  no
     ( cd libnids-%{V_libnids}
       PATH="`pwd`/../Libnet-%{V_libnet}:$PATH"
       define="LIBNET_LIL_ENDIAN"
-      case "%{l_target}" in
+      case "%{l_platform -t}" in
           sparc*-* ) define="LIBNET_BIG_ENDIAN" ;;
           *68*-*   ) define="LIBNET_BIG_ENDIAN" ;;
       esac

dss/dss.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Video
 License:      APSL
 Version:      %{V_opkg}
-Release:      20030915
+Release:      20030918
 
 #   list of sources
 Source0:      http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@@ -48,8 +48,8 @@ Patch0:       dss.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030718, perl, make, gcc
-PreReq:       OpenPKG, openpkg >= 20030718, perl, perl-ssl
+BuildPreReq:  OpenPKG, openpkg >= 20030909, perl, make, gcc
+PreReq:       OpenPKG, openpkg >= 20030909, perl, perl-ssl
 AutoReq:      no
 AutoReqProv:  no
 

exim/exim.spec

@@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK]
 Group:        Mail
 License:      GPL
 Version:      4.22
-Release:      20030818
+Release:      20030918
 
 #   package options
 %option       with_fsl  yes
@@ -49,8 +49,8 @@ Source3:      fsl.exim
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030718, perl, gzip
-PreReq:       OpenPKG, openpkg >= 20030718, perl, gzip
+BuildPreReq:  OpenPKG, openpkg >= 20030909, perl, gzip
+PreReq:       OpenPKG, openpkg >= 20030909, perl, gzip
 BuildPreReq:  openssl, db >= 4.1.24, libiconv
 PreReq:       openssl, db >= 4.1.24, libiconv
 %if "%{with_fsl}" == "yes"
@@ -115,7 +115,7 @@ Conflicts:    postfix, sendmail, ssmtp
 
     make="%{l_make}"
     mflags="%{l_mflags}"
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) make="make"; mflags=""; PATH="/usr/bin:$PATH" ;;
     esac
     $make $mflags makefile
@@ -143,7 +143,7 @@ Conflicts:    postfix, sendmail, ssmtp
     INST_INFO_DIRECTORY=$RPM_BUILD_ROOT%{l_prefix}/info; export INST_INFO_DIRECTORY
     make="%{l_make}"
     mflags="%{l_mflags}"
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) make="make"; mflags=""; PATH="/usr/bin:$PATH" ;;
     esac
     $make $mflags install

findutils/findutils.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Utility
 License:      GPL
 Version:      4.1.20
-Release:      20030721
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://alpha.gnu.org/gnu/findutils/findutils-%{version}.tar.gz
@@ -42,8 +42,8 @@ Source1:      rc.findutils
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030718
-PreReq:       OpenPKG, openpkg >= 20030718
+BuildPreReq:  OpenPKG, openpkg >= 20030909
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -57,7 +57,7 @@ AutoReqProv:  no
     CC="%{l_cc}"
     CFLAGS="%{l_cflags -O}"
     CPPFLAGS=""
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) CPPFLAGS="-DHAVE_F_FSTYPENAME_IN_STATFS" ;;
     esac
     export CC CFLAGS CPPFLAGS

ghostscript/ghostscript.spec

@@ -42,7 +42,7 @@ Distribution: OpenPKG [BASE]
 Group:        Graphics
 License:      Aladdin
 Version:      %{V_real}
-Release:      20030818
+Release:      20030918
 
 #   package options
 %option       with_x11     yes
@@ -58,8 +58,8 @@ Source5:      ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/ghostscript-
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, gcc, make
-PreReq:       OpenPKG, openpkg >= 20030103
+BuildPreReq:  OpenPKG, openpkg >= 20030909, gcc, make
+PreReq:       OpenPKG, openpkg >= 20030909
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11
 PreReq:       X11
@@ -89,10 +89,10 @@ AutoReqProv:  no
 %build
     mtcflags=""
     mtldflags=""
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) mtcflags=""; mtldflags="-lc_r"     ;;
         *-linux*   ) mtcflags=""; mtldflags="-lpthread" ;;
-        *-solaris* ) mtcflags=""; mtldflags="-lpthread" ;;
+        *-sunos*   ) mtcflags=""; mtldflags="-lpthread" ;;
     esac
     cd ghostscript-%{version}
 %if "%{with_x11}" == "yes"

gnutls/gnutls.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Cryptography
 License:      GPL
 Version:      0.8.10
-Release:      20030810
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.gz
@@ -42,8 +42,8 @@ Patch0:       gnutls.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909
+PreReq:       OpenPKG, openpkg >= 20030909
 BuildPreReq:  gcrypt, libtasn1, lzo, getopt
 PreReq:       gcrypt, libtasn1, lzo, getopt
 AutoReq:      no
@@ -60,17 +60,16 @@ AutoReqProv:  no
     %patch -p0
 
 %build
-    case "%{l_target}" in
-        *-solaris*) libs="-lsocket -lnsl " ;;
-        *)          libs=""                ;;
+    libs=""
+    case "%{l_platform -t}" in
+        *-sunos* ) libs="-lsocket -lnsl" ;;
     esac
-
     echo 'ac_cv_type_ptrdiff_t=yes' >config.cache
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O} %{l_cppflags lzo}" \
     CPPFLAGS="%{l_cppflags} %{l_cppflags lzo}" \
     LDFLAGS="%{l_ldflags}" \
-    LIBS="$libs-lgetopt" \
+    LIBS="$libs -lgetopt" \
     LIBOPENCDK_CONFIG=no \
     ./configure \
         --cache-file=config.cache \

guile/guile.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Language
 License:      GPL
 Version:      1.6.4
-Release:      20030801
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/guile/guile-%{version}.tar.gz
@@ -42,8 +42,8 @@ Patch0:       guile.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, texinfo, gcc
-PreReq:       OpenPKG, openpkg >= 20020206, libtool
+BuildPreReq:  OpenPKG, openpkg >= 20030909, make, texinfo, gcc
+PreReq:       OpenPKG, openpkg >= 20030909, libtool
 AutoReq:      no
 AutoReqProv:  no
 
@@ -57,10 +57,8 @@ AutoReqProv:  no
 
 %build
     opt="%{l_cflags -O}"
-    case "%{l_target}" in
-        *-solaris* )
-            opt="%{l_cflags}"
-            ;;
+    case "%{l_platform -t}" in
+        *-sunos* ) opt="%{l_cflags}" ;;
     esac
     CC="%{l_cc}" \
     LD="%{l_prefix}/bin/ld" \

hexer/hexer.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Editor
 License:      BSD
 Version:      0.1.4c
-Release:      20030728
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ftp.netsw.org/system/tools/fileutils/edit/hexer-%{version}.tar.gz
@@ -42,8 +42,8 @@ Patch0:       hexer.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030717
-PreReq:       OpenPKG, openpkg >= 20030717
+BuildPreReq:  OpenPKG, openpkg >= 20030909
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -58,10 +58,10 @@ AutoReqProv:  no
     #   choose platform specific configuration file
     #   and always rely on having an ISO C compiler
     ext=any
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) ext=bsd   ;;
         *-linux*   ) ext=linux ;;
-        *-solaris* ) ext=sunos ;;
+        *-sunos*   ) ext=sunos ;;
     esac
     %{l_shtool} install \
         -e 's;\(USE_STDARG\).*;\1 1;' \

icewm/icewm.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      1.2.12
-Release:      20030828
+Release:      20030918
 
 #   package options
 %option       with_iconv   no
@@ -47,8 +47,8 @@ Patch0:       icewm.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, imlib, gcc, make
-PreReq:       OpenPKG, openpkg >= 20030103, X11, imlib
+BuildPreReq:  OpenPKG, openpkg >= 20030909, X11, imlib, gcc, make
+PreReq:       OpenPKG, openpkg >= 20030909, X11, imlib
 %if "%{with_iconv}" == "yes"
 BuildPreReq:  libiconv
 PreReq:       libiconv
@@ -68,7 +68,7 @@ AutoReqProv:  no
         src/*.cc src/*.h
 
 %build
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) libs="-lkvm" ;;
         * )          libs=""      ;;
     esac
@@ -114,7 +114,7 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd* ) attr="2755,%{l_musr},kmem"      ;;
         * )          attr="0755,%{l_musr},%{l_mgrp}" ;;
     esac

icon/icon.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Language
 License:      GPL
 Version:      %{V_here}
-Release:      20030728
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ftp.cs.arizona.edu/icon/packages/unix/icon.v%{V_real}src.tgz
@@ -46,8 +46,8 @@ Patch0:       icon.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909, make, gcc
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -63,12 +63,12 @@ AutoReqProv:  no
     %patch -p0
 
 %build
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd*      ) name="freebsd"       ;;
         *-linux*        ) name="linux"         ;;
-        ix86-solaris*   ) name="intel_solaris" ;;
-        sparc*-solaris* ) name="sun_gcc"       ;;
-        * ) echo "platform %{l_target} not supported" 1>&2; exit 1 ;;
+        ix86-sunos*     ) name="intel_solaris" ;;
+        sparc*-sunos*   ) name="sun_gcc"       ;;
+        * ) echo "platform %{l_platform -t} not supported" 1>&2; exit 1 ;;
     esac
     %{l_make} %{l_mflags} Configure name=$name
     %{l_make} %{l_mflags}

imap/imap.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      University of Washington's Free-Fork License
 Version:      %{V_here}
-Release:      20030910
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z
@@ -45,8 +45,8 @@ Source0:      ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, openssl, gcc
-PreReq:       OpenPKG, openpkg >= 20020206, openssl
+BuildPreReq:  OpenPKG, openpkg >= 20030909, openssl, gcc
+PreReq:       OpenPKG, openpkg >= 20030909, openssl
 AutoReq:      no
 AutoReqProv:  no
 
@@ -58,12 +58,12 @@ AutoReqProv:  no
 
 %build
     os=""
-    case "%{l_target}" in
-        *-freebsd*) os=bsf ;;
-        *-linux*  ) os=slx ;;
-        *-solaris*) os=gso ;;
-        *-irix*   ) os=gsg ;;
-        *) echo "Unsupported platform %{l_target}" 1>&2; exit 1 ;;
+    case "%{l_platform -t}" in
+        *-freebsd* ) os=bsf ;;
+        *-linux*   ) os=slx ;;
+        *-sunos*   ) os=gso ;;
+        *-irix*    ) os=gsg ;;
+        *) echo "Unsupported platform %{l_platform -t}" 1>&2; exit 1 ;;
     esac
     %{l_make} $os \
         SSLDIR=%{l_prefix} \

imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      2.1.15
-Release:      20030818
+Release:      20030918
 
 #   package options
 %option       with_fsl    yes
@@ -51,8 +51,8 @@ Patch1:       imapd.patch.vhost
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030806, perl, perl-openpkg, make
-PreReq:       OpenPKG, openpkg >= 20030806, perl, MTA
+BuildPreReq:  OpenPKG, openpkg >= 20030909, perl, perl-openpkg, make
+PreReq:       OpenPKG, openpkg >= 20030909, perl, MTA
 BuildPreReq:  sasl, db >= 4.1.24, openssl
 PreReq:       sasl, db >= 4.1.24, openssl
 %if "%{with_fsl}" == "yes"
@@ -121,8 +121,8 @@ AutoReqProv:  no
 %build
     cflags="%{l_cppflags}"
     ldflags="%{l_ldflags} %{l_fsl_ldflags}"
-    case "%{l_target}" in
-        *-solaris* ) ldflags="$ldflags -lsocket -lnsl" ;;
+    case "%{l_platform -t}" in
+        *-sunos*   ) ldflags="$ldflags -lsocket -lnsl" ;;
     esac
     CC="%{l_cc}" \
     CPPFLAGS="$cflags" \

infozip/infozip.spec

@@ -38,8 +38,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Archiver
 License:      BSD
-Version:      20030731
-Release:      20030731
+Version:      20030918
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ftp.info-zip.org/pub/infozip/src/zip%{V_zip_real}.tar.gz
@@ -49,8 +49,8 @@ Patch0:       infozip.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -70,9 +70,9 @@ AutoReqProv:  no
     ) || exit $?
     ( cd unzip-%{V_unzip_here}
       os=generic
-      case "%{l_target}" in
+      case "%{l_platform -t}" in
           *-linux*      ) os=linux_noasm ;;
-          *-solaris*    ) os=solaris     ;;
+          *-sunos*      ) os=solaris     ;;
           ix86-freebsd* ) os=freebsd     ;;
           *-freebsd*    ) os=bsd         ;;
       esac

iozone/iozone.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Benchmark
 License:      Open Source
 Version:      %{V_logic}
-Release:      20030728
+Release:      20030918
 
 #   list of sources
 Source0:      http://www.iozone.org/src/current/iozone%{V_real}.tar
@@ -45,8 +45,8 @@ Source0:      http://www.iozone.org/src/current/iozone%{V_real}.tar
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, make
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909, gcc, make
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -64,12 +64,12 @@ AutoReqProv:  no
     cd src/current
     platform="generic"
     defs=""
-    case "%{l_target}" in
+    case "%{l_platform -t}" in
         *-freebsd*  ) platform="freebsd"  ;;
         *-linux2.2* ) platform="linux"
                       defs="-DNO_MADVISE" ;;
         *-linux*    ) platform="linux"    ;;
-        *-solaris*  ) platform="Solaris"  ;;
+        *-sunos*    ) platform="Solaris"  ;;
     esac
     %{l_make} %{l_mflags} \
         CC="%{l_cc}" CFLAGS="%{l_cflags -O}" MADV="$defs" \

ircii/ircii.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Network
 License:      BSD
 Version:      20030709
-Release:      20030710
+Release:      20030918
 
 #   list of sources
 Source0:      ftp://ircii.warped.com/pub/ircII/ircii-%{version}.tar.gz
@@ -41,8 +41,8 @@ Source0:      ftp://ircii.warped.com/pub/ircII/ircii-%{version}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909, gcc
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -54,8 +54,8 @@ AutoReqProv:  no
 
 %build
     libs=""
-    case "%{l_target}" in
-        *-solaris* ) libs="-lsocket -lnsl" ;;
+    case "%{l_platform -t}" in
+        *-sunos* ) libs="-lsocket -lnsl" ;;
     esac
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \

ispell/ispell.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        Text
 License:      BSD
 Version:      %{V_ispell}
-Release:      20030728
+Release:      20030918
 
 #   list of sources
 Source0:      http://fmg-www.cs.ucla.edu/geoff/tars/ispell-%{V_ispell}.tar.gz
@@ -49,8 +49,8 @@ Patch0:       ispell.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, bison, perl
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030909, make, bison, perl
+PreReq:       OpenPKG, openpkg >= 20030909
 AutoReq:      no
 AutoReqProv:  no
 
@@ -98,8 +98,8 @@ AutoReqProv:  no
       echo "#define WORDS      \"$RPM_BUILD_DIR/words\""
       echo "#define YACC       \"%{l_prefix}/bin/bison -y\""
       echo "#define TERMLIB    \"$termlib\""
-      case "%{l_target}" in
-          *-linux* | *-solaris* ) echo "#define USG" ;;
+      case "%{l_platform -t}" in
+          *-linux* | *-sunos* ) echo "#define USG" ;;
       esac
       #   echo "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
     ) >local.h