[Devil-linux-commit] build/scripts Mail-SpamAssassin,1.9,1.10 perl,1.38,1.39 razor-agents,1.4,1.5

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9390/scripts

Modified Files:
	Mail-SpamAssassin perl razor-agents 
Log Message:
more fixes to get the thread safe compile working


Index: Mail-SpamAssassin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Mail-SpamAssassin	12 Dec 2004 21:48:08 -0000	1.9
+++ Mail-SpamAssassin	13 Dec 2004 22:12:29 -0000	1.10
@@ -27,7 +27,7 @@
 case $1 in
 	build )
 		if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then
-			perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1
+			perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc ENABLE_SSL=yes < /dev/null || exit 1
 			# now override the PREFIX setting to not use $TMPDIR%. MakeMaker
 			# does not have a better way to do this, it seems...
 			make $PMAKE PREFIX=/usr || exit 1
@@ -41,7 +41,7 @@
 		if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 
-			make install || exit 1
+			make DESTDIR=$TMPDIR install || exit 1
 
 			install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1
 

Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- perl	13 Dec 2004 18:45:23 -0000	1.38
+++ perl	13 Dec 2004 22:12:29 -0000	1.39
@@ -28,8 +28,6 @@
 case $1 in
     build )
 		if [ "$CONFIG_PERL" = "y" ]; then
-			echo $TMPDIR > DL.TMPDIR
-
 			echo >> ./hints/linux.sh
 			echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh
 			
@@ -40,18 +38,7 @@
 			#strip_debug
 
 			# I don't know why, but we loose the variable...
-			rm -rf $TMPDIR || exit 1
-			mkdir -p $TMPDIR || exit 1
-			make install DESTDIR=$TMPDIR || exit 1
-			rm -f /usr/share/man/man1/s2p.1 /usr/share/man/man1/psed.1 /usr/share/man/man1/c2ph.1 /usr/share/man/man1/pstruct.1
-			rm -f /usr/bin/perl*
-			rm -f /usr/bin/s2p /usr/bin/psed
-			rm -f /usr/bin/pstruct /usr/bin/c2ph
-			cp -vfdpR $TMPDIR/usr/* /usr || exit 1
-
-			# delete the old perl version
-			test -d /usr/lib/perl5/5.8.0 && rm -rf /usr/lib/perl5/5.8.0
-			test -d /usr/lib/perl5/site_perl/5.8.0 && rm -rf /usr/lib/perl5/site_perl/5.8.0
+			make install || exit 1
 
 			# now let's take care of all the perl extension
 			rm -rf $WORKDIR/perl-ext
@@ -72,9 +59,9 @@
 			do
 				pushd $EXT
 				echo "******** compiling perl extension $EXT ********"
-				yes "" | perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR || exit 1
+				yes "" | perl Makefile.PL PREFIX=/usr|| exit 1
 				strip_debug
-				make install || exit 1
+				make install DESTDIR=$TMPDIR || exit 1
 				popd
 			done
 			
@@ -84,10 +71,9 @@
 
     install )
 		if [ "$CONFIG_PERL" = "y" ]; then
-			TMPDIR=$(cat DL.TMPDIR)
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR|| exit 1
-			make install || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
 			copy_docs $TMPDIR
 			rm $TMPDIR/usr/bin/c2ph || exit 1
 			ln -s pstruct $TMPDIR/usr/bin/c2ph || exit 1

Index: razor-agents
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/razor-agents,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- razor-agents	12 Dec 2004 21:48:09 -0000	1.4
+++ razor-agents	13 Dec 2004 22:12:29 -0000	1.5
@@ -25,7 +25,7 @@
 case $1 in
 	build )
 		if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then
-			perl Makefile.PL PREFIX=/usr DESTDIR=$TMPDIR < /dev/null || exit 1
+			perl Makefile.PL PREFIX=/usr < /dev/null || exit 1
 
 			# now override the PREFIX setting to not use $TMPDIR%. MakeMaker
 			# does not have a better way to do this, it seems...
@@ -33,7 +33,7 @@
 			strip_debug
 
 			# we need to install it, otherwise it will fail later
-			make install DESTDIR= || exit 1
+			make install || exit 1
 		fi
 		;;
 
@@ -41,7 +41,7 @@
 		if [ "$CONFIG_RAZOR_AGENTS" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 
-			make install || exit 1
+			make DESTDIR=$TMPDIR install || exit 1
 
 			copy_docs $TMPDIR
 			copy_files $TMPDIR/usr $CDDIR/ || exit 1