Chris Hamilton <chris@ambigc.com>:

fixed povray31 - tar flag bad 
fixed rocksndiamonds - mv to cp for stage 9 and reinstalls 
fixed snort
fixed qtparted - for new Qt
correctly updated emacs-xemacs-shared
fixed spamassassin - moved config to /etc/spamassassin and enabled ssl
fixed slidentd


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

package/esden/povray31/povray31.conf

@@ -21,8 +21,8 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 main() {
-tar $taropts $archdir/povuni_d-$ver.tbz2 -C $root/$prefix/lib
-tar $taropts $archdir/povuni_s-$ver.tbz2
+tar $taropt $archdir/povuni_d-$ver.tbz2 -C $root/$prefix/lib
+tar $taropt $archdir/povuni_s-$ver.tbz2
 cd povray31/
 
 for x in $patchfiles ; do

package/kasc/rocksndiamonds/rocksndiamonds.conf

@@ -35,10 +35,10 @@ rocksndiamonds_inmake() {
 # make install isnt avaliable, yet. author promised to fix that ;)
   mkdir -p $datadir/rocksndiamonds $root/var/games/rocksndiamonds
   mkdir -p $scoredir
-  mv -f graphics levels music sounds $datadir/rocksndiamonds/
-  mv -f scores $scoredir
-  mv -f rocksndiamonds $bindir
-  mv -f rocksndiamonds.1 $mandir/man6/rocksndiamonds.6
+  cp -af graphics levels music sounds $datadir/rocksndiamonds/
+  cp -af scores $scoredir
+  cp -af rocksndiamonds $bindir
+  cp -af rocksndiamonds.1 $mandir/man6/rocksndiamonds.6
 }
 
 makeinstopt=""

package/misc/snort/snort.conf

@@ -25,28 +25,12 @@ if [ $prefix_auto = 1 ] ; then
 	set_confopt
 fi
 
+#No clean install dir checks in ROCK yet.
 # postgresql support
-if [ -n "$pkg_postgresql_prefix" ] ; then
-	var_append extraconfopt " " "--with-postgresql=$pkg_postgrsql_prefix"
-fi
-		
-# mysql support
-if [ -n "$pkg_mysql_prefix" ] ; then
-	var_append extraconfopt " " "--with-mysql=$pkg_mysql_prefix"
-fi
+pkginstalled postgresql && var_append extraconfopt " " "--with-postgresql=/opt/postgresql"
 
-# openSSL support
-ssldir=""
-if [ -r /opt/openssl/include/crypto.h ] ; then
-	ssldir=/opt/openssl
-elif [ -r /usr/include/openssl/crypto.h ]; then
-	ssldir=/usr/
-elif [ -r /usr/local/include/openssl/crypto.h ]; then
-	ssldir=/usr/local/
-fi
-if [ "$ssldir" != "" ] ; then
-	var_append extraconfopt " " "--with-openssl=$ssldir"
-fi
+# mysql support
+pkginstalled mysql && var_append extraconfopt " " "--with-mysql=/opt/mysql"
 
 # FlexResp feature
 # NOTE: At time of writing, FlexResp:
@@ -78,20 +62,11 @@ snort_postmake()
 	# For security reasons this directory should not be world-readable
 	mkdir -p $root/$prefix/var
 	mkdir -p $root/$prefix/etc
-	cp -r etc/* $root/$prefix/etc/
-	cp -r rules $root/$prefix/etc/
+	cp -fr etc/* $root/$prefix/etc/
+	cp -fr rules $root/$prefix/etc/
 
-	# THIS IS DANGEROUS - IT MIGHT AFFECT OTHER PACKAFES FILES !!!
-	# FIS THIS PROPERLY!
-	# mv /opt/snort/etc/etc/* /opt/snort/etc/
-	# rm -rf /opt/snort/etc/etc/	
 	sed -i 's/\.\.\/rules/.\/rules/' $root/$prefix/etc/snort.conf
 
-	# THIS IS DANGEROUS - IT MIGHT AFFECT OTHER PACKAGES FILES !!!
-	# Remove Makefiles (left from build)
-	# rm -f $root/$prefix/*/Makefile*
-	# rm -f $root/$prefix/*/*/Makefile*
-
 	# Create a SysV init script for snort
 	install_init snort $confdir/snort.init
 }

package/misc/snort/snort.desc

@@ -35,8 +35,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.0.6
+[V] 2.1.1
 [P] X -----5---9 963.000
 
-[D] 2325136399 snort-2.0.6.tar.gz http://www.snort.org/dl/
+[D] 3336691458 snort-2.1.1.tar.gz http://www.snort.org/dl/
 

package/misc/snort/snort.init

@@ -32,11 +32,11 @@ main_begin
     block_end
 
     block_begin(stop, `Stopping snort (daemon mode).')
-	check(`killall -15 /opt/snort/bin/snort')
+	check(`killall -15 snort')
     block_end
 
     block_begin(stop, `Restarting snort (daemon mode).')
-	check(`killall -1 /opt/snort/bin/snort')
+	check(`killall -1 snort')
     block_end
 
 main_end

package/nikolaus/qtparted/qtparted.conf

@@ -21,7 +21,5 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-export QTDIR=$QT31DIR
-
 # disable reiserfs due to missing libreiserfs
-var_append extraconfopt " " "--disable-reiserfs"
+var_append extraconfopt " " "--disable-reiserfs --enable-shared --disable-static"

package/rene/emacs-xemacs-shared/emacs-xemacs-shared.desc

@@ -33,6 +33,6 @@
 
 [L] Free-to-use
 [S] Stable
-[V] 21.4.14
+[V] 21.4.15
 [P] X -----5---9 378.000
 

package/rene/spamassassin/spamassassin.conf

@@ -22,6 +22,6 @@
 
 # SpamAssassin doesn't use autoconf anymore
 runconf=0
-runmkpl=1
 
+hook_add premake 3 "perl Makefile.PL CONFDIR=/etc/spamassassin ENABLE_SSL=yes"
 hook_add postinstall 3 "install_init spamd $confdir/spamassassin.init"

package/sirkull/slidentd/slidentd.desc

@@ -46,3 +46,6 @@
 
 [D] 3497355209 slidentd-1.0.0.tar.gz http://www.uncarved.com/slidentd/
 
+[O] runconf=0
+[O] makeopt="INCLUDES='-I/usr/include/libowfat' LIBDIRS='-L/usr/lib' DESTDIR='$prefix' install"
+