diff --git a/autoconf/autoconf.spec b/autoconf/autoconf.spec
index 220efe85ce..e369311a15 100644
--- a/autoconf/autoconf.spec
+++ b/autoconf/autoconf.spec
@@ -37,7 +37,7 @@ Distribution: OpenPKG [CORE]
 Group:        Development
 License:      GPL
 Version:      %{V_latest}
-Release:      20021204
+Release:      20030721
 
 #   list of sources
 Source1:      ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz
@@ -65,7 +65,7 @@ AutoReqProv:  no
     %setup0 -q -c -n autoconf-%{V_latest}
     %setup1 -q -T -D -a 1
     cd autoconf-%{V_old}
-    %{l_patch} -p0 <%{SOURCE autoconf-%{V_old}.patch}
+    %{l_patch} -p0 <%{PATCH autoconf-%{V_old}.patch}
 
 %build
     ( cd autoconf-%{V_old}
diff --git a/gcc/gcc.spec b/gcc/gcc.spec
index 74105c9bf4..031598a22a 100644
--- a/gcc/gcc.spec
+++ b/gcc/gcc.spec
@@ -39,7 +39,7 @@ Distribution: OpenPKG [CORE]
 Group:        Language
 License:      GPL
 Version:      %{V_full}
-Release:      20030717
+Release:      20030721
 
 #   package options
 %option       with_cxx       yes
@@ -88,7 +88,7 @@ Provides:     gcc = %{version}-%{release}
 %endif
 %if "%{with_spp}" == "yes"
     ( cd gcc
-      %{l_gzip} -d -c %{SOURCE protector-%{version}-%{V_spp}.tar.gz} | %{l_tar} xf -
+      %{l_gzip} -d -c %{PATCH protector-%{version}-%{V_spp}.tar.gz} | %{l_tar} xf -
       %{l_patch} -p1 <protector.dif ) || exit $?
 %endif
     %{l_shtool} subst -v -s \
diff --git a/imapd/imapd.spec b/imapd/imapd.spec
index 8a72f177c9..bd3916c22f 100644
--- a/imapd/imapd.spec
+++ b/imapd/imapd.spec
@@ -116,7 +116,7 @@ Provides:     IMAP
 
 %if "%{with_vhost_hack}" == "yes"
     #   allow @ in LMTP mailbox names
-    %{l_patch} -p1 <%{SOURCE vhosthack.patch}
+    %{l_patch} -p1 <%{PATCH vhosthack.patch}
 %endif
 
 %build
diff --git a/j2se14/j2se14.spec b/j2se14/j2se14.spec
index c7c214256b..1fbac5cca9 100644
--- a/j2se14/j2se14.spec
+++ b/j2se14/j2se14.spec
@@ -38,7 +38,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Language
 License:      Commercial
 Version:      %{V_openpkg}
-Release:      20030719
+Release:      20030721
 
 #   list of sources
 Source0:      http://java.sun.com/j2se/::/j2sdk-%{V_sunjava}-linux-i586.bin
@@ -81,12 +81,12 @@ Conflicts:    j2se
     pkgdir=%{V_filesys}
     case "%{l_target}" in
         ix86-linux2.[2-5]* | ix86-freebsd[45]* )
-            pkgfile="j2sdk-%{V_sunjava}-linux-i586.bin"
+            pkgfile="%{SOURCE j2sdk-%{V_sunjava}-linux-i586.bin}"
             pkgdir="j2sdk%{V_filesys}"
             ;;
         sparc64-solaris2.[6-9]*)
-            pkgfile="j2sdk-%{V_sunjava}-solaris-sparc.sh"
-            suppfile="j2sdk-%{V_sunjava}-solaris-sparcv9.sh"
+            pkgfile="%{SOURCE j2sdk-%{V_sunjava}-solaris-sparc.sh}"
+            suppfile="%{SOURCE j2sdk-%{V_sunjava}-solaris-sparcv9.sh}"
             pkgdir="j2sdk%{V_filesys}"
             ;;
     esac
@@ -109,13 +109,13 @@ Conflicts:    j2se
         cd $RPM_BUILD_ROOT%{l_prefix}/libexec
         case "%{l_target}" in
             ix86-linux2.[2-5]* | ix86-freebsd4* )
-                echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
+                echo "yes" | sh $pkgfile \
                     >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc/COPYING.32
                 ;;
             sparc64-solaris2.[6-9]*)
-                echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
+                echo "yes" | sh $pkgfile \
                     >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc/COPYING.32
-                echo "yes" | sh $RPM_SOURCE_DIR/$suppfile \
+                echo "yes" | sh $suppfile \
                     >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc/COPYING.64
                 ;;
         esac
diff --git a/perl-conv/perl-conv.spec b/perl-conv/perl-conv.spec
index fe68cf1119..ad1f2f4073 100644
--- a/perl-conv/perl-conv.spec
+++ b/perl-conv/perl-conv.spec
@@ -44,8 +44,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030709
-Release:      20030709
+Version:      20030721
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Convert/Convert-ASN1-%{V_convert_asn1}.tar.gz
@@ -81,7 +81,7 @@ AutoReqProv:  no
     %setup3 -q -T -D -a 3
     %setup4 -q -T -D -a 4
     %setup5 -q -T -D -a 5
-    %setup5 -q -T -D -a 6
+    %setup6 -q -T -D -a 6
 
 %build
 
diff --git a/perl-curses/perl-curses.spec b/perl-curses/perl-curses.spec
index 72c47e05d5..f73e9e8417 100644
--- a/perl-curses/perl-curses.spec
+++ b/perl-curses/perl-curses.spec
@@ -40,8 +40,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030709
-Release:      20030709
+Version:      20030721
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Curses/Curses-%{V_curses}.tar.gz
@@ -77,7 +77,7 @@ AutoReqProv:  no
     %setup3 -q -T -D -a 3
     %setup4 -q -T -D -a 4
     %setup5 -q -T -D -a 5
-    (cd Curses-UI-%{V_curses_ui} && %{l_patch} -p0 <%{SOURCE perl-curses.patch})
+    (cd Curses-UI-%{V_curses_ui} && %{l_patch} -p0 <%{PATCH perl-curses.patch})
 
 %build
 
diff --git a/perl-ds/perl-ds.spec b/perl-ds/perl-ds.spec
index 906b482117..65db4ac44b 100644
--- a/perl-ds/perl-ds.spec
+++ b/perl-ds/perl-ds.spec
@@ -39,8 +39,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030123
-Release:      20030123
+Version:      20030721
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Bit/Bit-Vector-%{V_bit_vector}.tar.gz
@@ -70,7 +70,7 @@ AutoReqProv:  no
     %setup1 -q -T -D -a 1
     %setup2 -q -T -D -a 2
     %setup3 -q -T -D -a 3
-    %setup3 -q -T -D -a 4
+    %setup4 -q -T -D -a 4
 
 %build
 
diff --git a/perl-sys/perl-sys.spec b/perl-sys/perl-sys.spec
index 98af4a74c2..434dd5ded4 100644
--- a/perl-sys/perl-sys.spec
+++ b/perl-sys/perl-sys.spec
@@ -43,8 +43,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030718
-Release:      20030718
+Version:      20030721
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Unix/Unix-Syslog-%{V_unix_syslog}.tar.gz
@@ -86,7 +86,7 @@ AutoReqProv:  no
     %setup5 -q -T -D -a 5
     %setup6 -q -T -D -a 6
     %setup7 -q -T -D -a 7
-    %setup7 -q -T -D -a 8
+    %setup8 -q -T -D -a 8
 
 %build
 
diff --git a/perl-text/perl-text.spec b/perl-text/perl-text.spec
index a8c206f614..676b920c86 100644
--- a/perl-text/perl-text.spec
+++ b/perl-text/perl-text.spec
@@ -40,8 +40,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030622
-Release:      20030622
+Version:      20030721
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Text/Text-Template-%{V_text_template}.tar.gz
@@ -73,8 +73,8 @@ AutoReqProv:  no
     %setup1 -q -T -D -a 1
     %setup2 -q -T -D -a 2
     %setup3 -q -T -D -a 3
-    %setup3 -q -T -D -a 4
-    %setup3 -q -T -D -a 5
+    %setup4 -q -T -D -a 4
+    %setup5 -q -T -D -a 5
 
 %build
 
diff --git a/perl-www/perl-www.spec b/perl-www/perl-www.spec
index 6cc0c3c25a..f57c4c0048 100644
--- a/perl-www/perl-www.spec
+++ b/perl-www/perl-www.spec
@@ -48,8 +48,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030717
-Release:      20030717
+Version:      20030721
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
@@ -107,7 +107,7 @@ AutoReqProv:  no
     %setup10 -q -T -D -a 10
     %setup11 -q -T -D -a 11
     %setup12 -q -T -D -a 12
-    %setup12 -q -T -D -a 13
+    %setup13 -q -T -D -a 13
     %patch0  -p0
 
 %build
diff --git a/pgp/pgp.spec b/pgp/pgp.spec
index 60bad67c4a..aad2de90d9 100644
--- a/pgp/pgp.spec
+++ b/pgp/pgp.spec
@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        Cryptography
 License:      GPL
 Version:      %{V_long}
-Release:      20030708
+Release:      20030721
 
 #   list of sources
 Source0:      ftp://ftp.pgpi.org/pub/pgp/%{V_short}/%{V_long}/pgpsrc%{V_strip}unix.tar.gz
@@ -62,7 +62,7 @@ AutoReqProv:  no
     %{l_gzip} -d -c %{SOURCE pgpsrc%{V_strip}unix.tar.gz} | %{l_tar} xf -
     %{l_gzip} -d -c pgpsrc%{V_strip}unix.tar.gz | %{l_tar} xf -
     cd pgpsrc
-    %{l_patch} -p0 <%{SOURCE pgpsrc%{V_strip}unix.patch}
+    %{l_patch} -p0 <%{PATCH pgpsrc%{V_strip}unix.patch}
 
 %build
     cd pgpsrc
diff --git a/postfix/postfix.spec b/postfix/postfix.spec
index d0aca5f5d5..c39a846ad5 100644
--- a/postfix/postfix.spec
+++ b/postfix/postfix.spec
@@ -126,7 +126,7 @@ Conflicts:    sendmail, ssmtp, exim
 %endif
 
     #   apply pflogsumm patch
-    ( cd pflogsumm-%{V_pflogsumm}; %{l_patch} -p0 <%{SOURCE pflogsumm.patch} )
+    ( cd pflogsumm-%{V_pflogsumm}; %{l_patch} -p0 <%{PATCH pflogsumm.patch} )
 
     #   drop deprecated openldap API
     %patch1 -p0
diff --git a/sendmail/sendmail.spec b/sendmail/sendmail.spec
index 809f8b18e8..2f5351c0f9 100644
--- a/sendmail/sendmail.spec
+++ b/sendmail/sendmail.spec
@@ -96,7 +96,7 @@ Conflicts:    ssmtp, exim, postfix
 
     #   apply patches for MySQL map support
     ( cd sendmail-%{version}
-      %{l_patch} -p1 <%{SOURCE sendmail.patch} )
+      %{l_patch} -p1 <%{PATCH sendmail.patch} )
 
     #   make install process unprivileged
     ( cd sendmail-%{version}