Alejandro Mery <amery@geeks.cl>:

perl 5.8.0->5.8.1
 - DB_File patch no longer needed
 - use_db3.patch addapted


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1539 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -11,7 +11,7 @@
                      fixed the bootdisk build
  - Alejandro Mery: fixed samba - smbadduser
                    added chkrootkit
-                   xfce (4.0.0)
+                   updated xfce (4.0.0) and perl (5.8.1)
  - Andreas V. Meier and Rene Rebe: fixed and cleanup of xdu
  - Daniel Pischl: updated icewm
 

package/base/perl5/perl5.conf

@@ -20,15 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-pkg_perl_dbfile() {
-	# updates DB_File to support bdb41
-	local dbfile=$( echo $desc_D | sed -n 's,.* DB_File-\(.*\).tar.*,\1,p' )
-	echo "Updating DB_File to $dbfile ... "
-	tar $taropt $archdir/DB_File-$dbfile.tar.bz2 -C ext
-	rm -rf ext/DB_File
-	mv ext/DB_File-$dbfile ext/DB_File
-}
-
 pkg_perl_postmake() {
 	h2ph $( grep ' usr/include/.*\.h$' \
 		$root/var/adm/flists/glibc* | sed 's,^.*: ,/,' )
@@ -57,7 +48,6 @@ confopt="-des -Dcc=gcc -Dprefix=/usr -Darchname=$arch_target \
 [ "$ROCKCFG_PKG_PERL5_THREADS" = "1" ] && confopt="$confopt -Dusethreads"
 [ "$ROCKCFG_PKG_PERL5_USE_DB3" = "1" ] && patchfiles="$patchfiles $confdir/use_db3.diff"
 
-hook_add prepatch 3 "pkg_perl_dbfile"
 hook_add preconf 2  "( rm -f config.sh Policy.sh; sh Configure $confopt; )"
 hook_add postmake 4 "pkg_perl_postmake"
 runconfig=0

package/base/perl5/perl5.desc

@@ -34,9 +34,8 @@
 
 [L] OpenSource
 [S] Stable
-[V] 5.8.0
+[V] 5.8.1
 [P] X ---3---7-9 135.000
 
-[D] 1044119087 perl-5.8.0.tar.gz http://www.perl.com/CPAN/src/5.0/
-[D] 2983865377 DB_File-1.806.tar.gz http://www.perl.com/CPAN/authors/id/P/PM/PMQS/
+[D] 4011897867 perl-5.8.1.tar.gz http://www.perl.com/CPAN/src/5.0/
 

package/base/perl5/use_db3.diff

@@ -20,35 +20,26 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./ext/DB_File/config.in.orig	2003-07-07 22:12:50.000000000 -0400
-+++ ./ext/DB_File/config.in	2003-07-07 22:16:44.000000000 -0400
-@@ -9,18 +9,20 @@
- #    Change the path below to point to the directory where db.h is
- #    installed on your system.
- 
--INCLUDE	= /usr/local/BerkeleyDB/include
-+#INCLUDE	= /usr/local/BerkeleyDB/include
- #INCLUDE	= /usr/local/include
- #INCLUDE	= /usr/include
-+INCLUDE	= /usr/include/db3
- 
- # 2. Where is libdb?
- #
- #    Change the path below to point to the directory where libdb is
- #    installed on your system.
- 
--LIB	= /usr/local/BerkeleyDB/lib
-+#LIB	= /usr/local/BerkeleyDB/lib
- #LIB	= /usr/local/lib
- #LIB	= /usr/lib
-+LIB	= /usr/lib
+Force perl5 to use bdb33, compatibility reasons.
+
+--- ./ext/DB_File/Makefile.PL.orig	2003-09-28 09:29:41.000000000 -0400
++++ ./ext/DB_File/Makefile.PL	2003-09-28 09:31:37.000000000 -0400
+@@ -8,15 +8,15 @@
+ # OS2 is a special case, so check for it now.
+ my $OS2 = "-DOS2" if $Config{'osname'} eq 'os2' ;
  
- # 3. What version of Berkely DB have you got?
- #
-@@ -93,5 +95,6 @@
- #    you have picked.
-  
- #DBNAME = -ldb-2.4.10
-+DBNAME = -ldb-3
+-my $LIB = "-ldb" ;
++my $LIB = "-ldb-3" ;
+ # so is win32
+ $LIB = "-llibdb" if $^O eq 'MSWin32' ;
  
- # end of file config.in
+ WriteMakefile(
+ 	NAME 		=> 'DB_File',
+-	LIBS 		=> ["-L/usr/local/lib $LIB"],
++	LIBS 		=> ["-L/usr/lib $LIB"],
+         MAN3PODS        => {},         # Pods will be built by installman.
+-	#INC		=> '-I/usr/local/include',
++	INC		=> '-I/usr/include/db3',
+ 	VERSION_FROM	=> 'DB_File.pm',
+ 	OBJECT		=> 'version$(OBJ_EXT) DB_File$(OBJ_EXT)',
+ 	XSPROTOARG	=> '-noprototypes',