diff --git a/sa/sa.spec b/sa/sa.spec
index 5d6b6411c3..a69e7f526d 100644
--- a/sa/sa.spec
+++ b/sa/sa.spec
@@ -23,9 +23,7 @@
 ##
 
 #   package options
-%ifndef       with_ex
-%define       with_ex  no
-%endif
+%option       with_ex  no
 
 #   package information
 Name:         sa
@@ -37,7 +35,7 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 License:      MIT/X11-style
 Version:      1.0.2
-Release:      20021216
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://ftp.ossp.org/pkg/lib/sa/sa-%{version}.tar.gz
@@ -45,8 +43,8 @@ Source0:      ftp://ftp.ossp.org/pkg/lib/sa/sa-%{version}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021230
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_ex}" == "yes"
 BuildPreReq:  ex
 PreReq:       ex
@@ -62,8 +60,7 @@ AutoReqProv:  no
     (local, IPv4, and IPv6), type abstraction, I/O timeouts, I/O stream
     buffering and convenience I/O functions.
 
-    Options: 
-    --define 'with_ex %{with_ex}'
+    %options
 
 %prep
     %setup -q
diff --git a/samba/samba.spec b/samba/samba.spec
index 8939c1e643..98cdfef59b 100644
--- a/samba/samba.spec
+++ b/samba/samba.spec
@@ -24,9 +24,7 @@
 ##
 
 #   package options
-%ifndef       with_pam
-%define       with_pam  no
-%endif
+%option       with_pam  no
 
 #   package information
 Name:         samba
@@ -38,7 +36,7 @@ Distribution: OpenPKG [BASE]
 Group:        Filesystem
 License:      GPL
 Version:      2.2.7a
-Release:      20021212
+Release:      20021230
 
 #   list of sources
 Source0:      http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
@@ -49,8 +47,8 @@ Source3:      rc.samba
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, openssl
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021230, openssl
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -62,8 +60,7 @@ AutoReqProv:  no
     Samba is an open source software suite that provides seamless file
     and print services to SMB/CIFS clients.
 
-    Options:
-    --define 'with_pam %{with_pam}'
+    %options
 
 %prep
     %setup -q
diff --git a/spegla/spegla.spec b/spegla/spegla.spec
index e155c4ae44..6fb2aa1965 100644
--- a/spegla/spegla.spec
+++ b/spegla/spegla.spec
@@ -24,9 +24,7 @@
 ##
 
 #   package options
-%ifndef       with_ipv6
-%define       with_ipv6  no
-%endif
+%option       with_ipv6  no
 
 #   package information
 Name:         spegla
@@ -38,7 +36,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Network
 License:      BSD
 Version:      1.1p4
-Release:      20020619
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://subzero.campus.luth.se/pub/spegla/spegla-%{version}.tar.gz
@@ -51,16 +49,15 @@ Patch1:       http://www.imasy.or.jp/~ume/ipv6/spegla-1.1p4-ipv6-20020129.diff.g
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021230
+PreReq:       OpenPKG, openpkg >= 20021230
 AutoReq:      no
 AutoReqProv:  no
 
 %description
     Spegla is fast mirroring tool for the File Transfer Protocol (FTP).
 
-    Options:
-    --define 'with_ipv6  %{with_ipv6}'
+    %options
 
 %prep
     %setup -q
diff --git a/sudo/sudo.spec b/sudo/sudo.spec
index c1a8cd04a7..504628cde6 100644
--- a/sudo/sudo.spec
+++ b/sudo/sudo.spec
@@ -24,9 +24,7 @@
 ##
 
 #   package options
-%ifndef       with_pam
-%define       with_pam    no
-%endif
+%option       with_pam    no
 
 #   package information
 Name:         sudo
@@ -38,7 +36,7 @@ Distribution: OpenPKG [BASE]
 Group:        System
 License:      BSD
 Version:      1.6.6
-Release:      20020916
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://ftp.courtesan.com/pub/sudo/sudo-%{version}.tar.gz
@@ -46,8 +44,8 @@ Source0:      ftp://ftp.courtesan.com/pub/sudo/sudo-%{version}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, MTA
-PreReq:       OpenPKG, openpkg >= 20020206, MTA
+BuildPreReq:  OpenPKG, openpkg >= 20021230, MTA
+PreReq:       OpenPKG, openpkg >= 20021230, MTA
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -60,8 +58,7 @@ AutoReqProv:  no
     users (or groups of users) the ability to run some (or all) commands
     as root or another user while logging the commands and arguments.
 
-    Options: 
-    --define 'with_pam %{with_pam}'
+    %options
 
 %prep
     %setup -q
diff --git a/tcl/tcl.spec b/tcl/tcl.spec
index 3c9cfa423a..dff1a1d8f9 100644
--- a/tcl/tcl.spec
+++ b/tcl/tcl.spec
@@ -29,9 +29,7 @@
 %define       V_level  1
 
 #   package options
-%ifndef       with_x11
-%define       with_x11 %{l_test -p x11}
-%endif
+%option       with_x11 %{l_test -p x11}
 
 #   package information
 Name:         tcl
@@ -43,7 +41,7 @@ Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL
 Version:      %{V_major}.%{V_minor}.%{V_level}
-Release:      20021023
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://ftp.scriptics.com/pub/tcl/tcl%{V_major}_%{V_minor}/tcl%{V_major}.%{V_minor}.%{V_level}-src.tar.gz
@@ -52,8 +50,8 @@ Source1:      ftp://ftp.scriptics.com/pub/tcl/tcl%{V_major}_%{V_minor}/tk%{V_maj
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021230
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11
 PreReq:       X11
@@ -65,8 +63,7 @@ AutoReqProv:  no
     The Tool Command Language (TCL), optionally including the
     popular TCL Widget Toolkit (Tk).
 
-    Options: 
-    --define 'with_x11 %{with_x11}'
+    %options
 
 %prep
     %setup0 -q -c -n tcl-%{V_major}.%{V_minor}.%{V_level}
diff --git a/tetex/tetex.spec b/tetex/tetex.spec
index 7bafed82fa..cf9b215167 100644
--- a/tetex/tetex.spec
+++ b/tetex/tetex.spec
@@ -28,9 +28,7 @@
 %define       V_texmf   1.0.2
 
 #   package options
-%ifndef       with_x11
-%define       with_x11  %{l_test -p x11}
-%endif
+%option       with_x11  %{l_test -p x11}
 
 #   package information
 Name:         tetex
@@ -42,7 +40,7 @@ Distribution: OpenPKG [BASE]
 Group:        Text
 License:      GPL
 Version:      %{V_src}
-Release:      20021216
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/teTeX-src-%{V_src}.tar.gz
@@ -54,8 +52,8 @@ Patch0:       tetex.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021204, make, infozip, flex, bison
-PreReq:       OpenPKG, openpkg >= 20021204
+BuildPreReq:  OpenPKG, openpkg >= 20021230, make, infozip, flex, bison
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11
 PreReq:       X11
@@ -72,8 +70,7 @@ AutoReqProv:  no
     xmltex (namespace-aware XML parser written in TeX) and Sebastian
     Rahtz' PassiveTeX (XML-FO rendering engine).
 
-    Options:
-    --define 'with_x11 %{with_x11}'
+    %options
 
 %prep
     %setup -q -n teTeX-%{V_base}
diff --git a/vim/vim.spec b/vim/vim.spec
index 42b5bfc520..3579f7e599 100644
--- a/vim/vim.spec
+++ b/vim/vim.spec
@@ -29,9 +29,7 @@
 %define       V_pl  267
 
 #   package options
-%ifndef       with_x11
-%define       with_x11  no
-%endif
+%option       with_x11  no
 
 #   package information
 Name:         vim
@@ -43,7 +41,7 @@ Distribution: OpenPKG [CORE]
 Group:        Editor
 License:      Charityware
 Version:      %{V_vl}.%{V_pl}
-Release:      20021228
+Release:      20021230
 
 #   list of sources
 Source0:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-src1.tar.gz
@@ -124,8 +122,8 @@ Patch267:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.267
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020714
-PreReq:       OpenPKG, openpkg >= 20020714
+BuildPreReq:  OpenPKG, openpkg >= 20021230
+PreReq:       OpenPKG, openpkg >= 20021230
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11, gtk
 PreReq:       X11, gtk
@@ -141,8 +139,7 @@ AutoReqProv:  no
     multi windows and buffers, syntax highlighting, com- mand line editing,
     filename completion, on-line help, and visual selection.
 
-    Options:
-    --define 'with_x11 %{with_x11}'
+    %options
 
 %prep
     %setup0 -q -c