replaced all cp file{,.orig} ; sed ... file.orig > file ; rm file.orig

whatever code fragments to in-place substitution (present in GNU/sed since
2001-09-25)


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

package/alessandro/postfix/postfix.conf

@@ -27,11 +27,10 @@ pkg_postfix_inmake() {
 	# need to really modify the config and the filenames - the
 	# INSTALL_WRAPPER can not be used.
 
-        sed -e "s,man1/mailq.1,man1/mailq_postfix.1," \
-	    -e "s,man1/newaliases.1,man1/newaliases_postfix.1," \
-	    -e "s,man5/aliases.5,man5/aliases_postfix.5," \
-	    conf/postfix-files > conf/postfix-files.orig
-	mv conf/postfix-files{.orig,}
+        sed -i -e "s,man1/mailq.1,man1/mailq_postfix.1," \
+	      -e "s,man1/newaliases.1,man1/newaliases_postfix.1," \
+	      -e "s,man5/aliases.5,man5/aliases_postfix.5," \
+	      conf/postfix-files
 	mv man/man5/aliases{,_postfix}.5
 	mv man/man1/newaliases{,_postfix}.1
 	mv man/man1/mailq{,_postfix}.1

package/alessandro/stunnel/stunnel.conf

@@ -24,8 +24,7 @@
 # you have to create it yourself after build
 # May be I'll create a stone mod ... someday
 pkg_stunnel_premake() {
-	mv tools/Makefile tools/Makefile.old
-	sed 's|^conf_DATA = stunnel.conf-sample stunnel.pem|conf_DATA = stunnel.conf-sample| ; /$(MAKE) $(AM_MAKEFLAGS) install-data-hook/ d;' < tools/Makefile.old > tools/Makefile
+	sed -i 's|^conf_DATA = stunnel.conf-sample stunnel.pem|conf_DATA = stunnel.conf-sample| ; /$(MAKE) $(AM_MAKEFLAGS) install-data-hook/ d;' tools/Makefile
 }
 
 premake="pkg_stunnel_premake"

package/alessandro/vsftpd/vsftpd.conf

@@ -21,6 +21,6 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 runconf=0
-premake='sed "s,/usr/local,/usr," < Makefile > Makefile.new ; mv -f Makefile.new Makefile'
+premake='sed -i "s,/usr/local,/usr," Makefile'
 postmake='cp vsftpd.conf $docdir'
 

package/base/gawk/gawk.conf

@@ -20,8 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
-
 var_append INSTALL_WRAPPER_FILTER "|" \
 	'sed -e "s,usr/bin/gawk$,bin/gawk,"'
 

package/base/gcc3/gcc3.conf

@@ -50,15 +50,14 @@ custmain() {
 	#
 	if [ $stagelevel -le 1 ] ; then
 		echo 'Setting LANGUAGES="c" in Makefile.in.'
-		mv Makefile.in Makefile.in.orig
-		sed -e 's/LANGUAGES="[^"]*"/LANGUAGES="c"/g' \
-			< Makefile.in.orig > Makefile.in
+		sed -i -e 's/LANGUAGES="[^"]*"/LANGUAGES="c"/g' \
+			  Makefile.in
 	elif [ "$ROCKCFG_DEBUG" = 1 ] ; then
 		if [ -f libstdc++*/configure ] ; then
 			echo "Setting DEBUG_FLAGS='-s' in libstdc++ configure."
-			( cd libstdc++* ; mv configure configure.orig
-			sed -e "s/DEBUG_FLAGS='-g'/DEBUG_FLAGS='-s'/g" \
-			configure.orig > configure )
+			( cd libstdc++*
+			sed -i -e "s/DEBUG_FLAGS='-g'/DEBUG_FLAGS='-s'/g" \
+			configure )
 		fi
 		MAKE="$MAKE LIBGCC2_DEBUG_CFLAGS=-s LDFLAGS=-Wl,-s JCFLAGS=-s"
 	fi

package/base/glibc22/glibc22.conf

@@ -77,8 +77,7 @@ glibc_custmain() {
 	if [ $crossnative = cross ] ; then
 		libcso=$root/usr/lib/libc.so
 		for x in 1 2 3 4 5 ; do
-			sed 's,/[a-z/]*/,,' < $libcso > $libcso.new
-			mv $libcso.new $libcso
+			sed -i 's,/[a-z/]*/,,' $libcso
 		done
 	fi
 

package/base/glibc23/glibc23.conf

@@ -77,8 +77,7 @@ glibc_custmain() {
 	#
 	if [ $stagelevel -le 1 ] ; then
 		libcso=$root/usr/lib/libc.so
-		sed 's,/[^ ]*/,,g' < $libcso > $libcso.new
-		mv $libcso.new $libcso
+		sed -i 's,/[^ ]*/,,g' $libcso
 	fi
 
 	# Install ld.so.conf

package/base/gzip/gzip.conf

@@ -28,10 +28,7 @@ pm_move_to_bin() {
 	ln $root/bin/gzip $root/bin/zcat
 
 	# correct the path used in the gzexe script
-	cp $root/usr/bin/gzexe{,.orig}
-	sed 's,"/usr/bin"/gzip,"/bin"/gzip,g' < $root/usr/bin/gzexe.orig \
-		> $root/usr/bin/gzexe
-	rm -f $root/usr/bin/gzexe.orig
+	sed -i 's,"/usr/bin"/gzip,"/bin"/gzip,g' $root/usr/bin/gzexe
 }
 
 hook_add postmake 5 "pm_move_to_bin"

package/base/isdn4k-utils/isdn4k-utils.conf

@@ -20,7 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 i4l_main() {
 	# Make sure libtool gets recreated to avoid version conflicts
 	cd capi20 ; libtoolize -f -c ; cd ..
@@ -29,7 +28,7 @@ i4l_main() {
 		MAKE="$MAKE CONFIG_XISDNLOAD=n CONFIG_XMONISDN=n"
 	fi
 
-#	sed 's/\(.*CAPICTRL=y.*)/#\1/g' < .config.rpm > .config
+#	sed -i 's/\(.*CAPICTRL=y.*)/#\1/g' .config.rpm
 	cp .config.rpm .config
 	touch rcapid/acinclude.m4
 	eval $MAKE subconfig ; eval $MAKE ; eval $MAKE install

package/base/ncurses/ncurses.conf

@@ -28,8 +28,7 @@ prepatch="bunzip2 < $archdir/termtypes.ti.bz2 > misc/terminfo.src"
 
 remove_include_termcap() {
 	echo "Removing 'termcap.h' from include/Makefile for 'make install'."
-	mv include/Makefile include/Makefile.old
-	sed 's,termcap.h,,g' < include/Makefile.old > include/Makefile
+	sed -i 's,termcap.h,,g' include/Makefile
 }
 
 if [ -f $root/var/adm/packages/termcap ] ; then

package/base/nvi/nvi.conf

@@ -20,14 +20,12 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 patch_all_c() {
 	echo -n 'Patching a few Makefiles:'
 	for x in `find -name '[Mm]akefile' -type f`
 	do
 		echo -n " $x"
-		mv $x $x.orig
-		sed 's|/usr/local|/usr|' < $x.orig > $x
+		sed -i 's|/usr/local|/usr|' $x
 	done
 	echo "done."
 }

package/base/psutils/psutils.conf

@@ -21,3 +21,4 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 premake="sed 's,/local/,/,' < Makefile.unix > Makefile"
+

package/base/tar/tar.conf

@@ -20,14 +20,13 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 # flistdel="$flistdel|usr/libexec/rmt"
 
 if [ $stagelevel -le 1 ]
 then
-	premake="mv lib/Makefile lib/Makefile.orig ; \
-	sed 's/gmalloc.o//' < lib/Makefile.orig > lib/Makefile"
+	premake="sed -i 's/gmalloc.o//' lib/Makefile"
 fi
 
 postmake="mv -v $root/usr/bin/tar $root/bin/tar ; \
 install -m 0644 -o root -g root ${builddir}/$pkg-$ver/tar.1 $root/usr/man/man1/"
+

package/base/texinfo/texinfo.conf

@@ -21,9 +21,7 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 no_doc_info_subdirs() {
-	sed '/^SUBDIRS/ { s/\bdoc\b//; s/\binfo\b//; }' \
-				< Makefile > Makefile.new
-	mv Makefile.new Makefile
+	sed -i '/^SUBDIRS/ { s/\bdoc\b//; s/\binfo\b//; }' Makefile
 }
 
 if [ $stagelevel -le 1 ] ; then

package/base/util-linux/util-linux.conf

@@ -24,14 +24,12 @@ prepare_cross_build() {
 	for x in `grep -l 'LIBCURSES.' */Makefile`
 	do
 		echo -n "Patching $x ... "
-		mv $x $x.orig
-		sed 's/\$(LIBCURSES)//g' < $x.orig > $x
+		sed -i 's/\$(LIBCURSES)//g' $x
 		echo "done"
 	done
 	for x in `egrep -l '#.*include.*[<"](n?curses|term).h[">]' */*.c`
 	do
 		echo -n "Killing $x ... "
-		mv $x $x.orig
 		echo "int main() { return 1; }" > $x
 		echo "done"
 	done

package/clifford/calltree/calltree.conf

@@ -20,7 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 # Schilly has a different idea of how to build a
 # source package and write makefiles than the rest
 # of the world...

package/esden/povray31/povray31.conf

@@ -21,8 +21,9 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 main() {
-tar --use-compress-program=bzip2 -xvf $archdir/povuni_d-$ver.tbz2 -C $root/$prefix/lib
-tar --use-compress-program=bzip2 -xvf $archdir/povuni_s-$ver.tbz2 ; cd povray31/
+tar $taropts $archdir/povuni_d-$ver.tbz2 -C $root/$prefix/lib
+tar $taropts $archdir/povuni_s-$ver.tbz2
+cd povray31/
 
 for x in $patchfiles ; do
 	patch $patchopt -i $x
@@ -30,12 +31,9 @@ done
 
 cd source/unix
 
-sed "s,/usr/local/lib/povray31,$root/$prefix/lib/povray31," < povrayrc > povrayrc.new
-mv povrayrc.new povrayrc
+sed -i "s,/usr/local/lib/povray31,$root/$prefix/lib/povray31," povrayrc
 
-sed "s,/usr/local/lib/povray31,$root/$prefix/lib/povray31," < $root/$prefix/lib/povray31/povray.ini \
-	> $root/$prefix/lib/povray31/povray.ini.new
-mv $root/$prefix/lib/povray31/povray.ini.new $root/$prefix/lib/povray31/povray.ini
+sed -i "s,/usr/local/lib/povray31,$root/$prefix/lib/povray31," $root/$prefix/lib/povray31/povray.ini
 
 if [ "$ROCKCFG_PKG_POVRAY31_XBINARY" == 1 ] ; then makesteps="newunix newxwin install" ; else makesteps="newunix install" ; fi
 

package/fake/bluez-utils/bluez-utils.conf

@@ -31,9 +31,10 @@ pm_hcid() {
 pre_hcid() {
 	local x
 	for x in hcid/hcid.h hcid/hcid.conf ; do
-		sed -e "s,/bin/bluepin,/${prefix}&," $x > $x.tmp ; mv -fv $x.tmp $x
+		sed -i -e "s,/bin/bluepin,/${prefix}&," $x
 	done
 }
 
 postmake="pm_hcid"
 premake="pre_hcid"
+

package/gnome24/gimp/gimp.conf

@@ -22,19 +22,6 @@
 
 . $base/package/*/*/gnome-24.conf
 
-# can be reenabled if s.o. finds out how to build this stuff correctly ...
-
-# don't install this file - we are using the gimp-print package
-# var_append INSTALL_WRAPPER_FILTER "|" 'sed -e "s,.*/plug-ins/print\$,,"'
-
-# var_append confopt " " "--disable-print"
-
-#@FIXME: on pentium-mmx, gimp is compiled with sse support, is this okay?
-#  --enable-mmx            enable MMX support (default=auto)
-#  --enable-sse            enable SSE support (default=auto)
-#  --enable-altivec        enable Altivec support (default=auto)
 #  --enable-mp             support multiple processors (default=no)
 #  --enable-python         build python extension (by default disabled)
-#  --with-sendmail=DIR     set sendmail command location
-#  --with-pdbgen           use 'pdbgen' code generation tool
-#  --with-desktop-dir=PATH where to install desktop files (default=PREFIX/share)
+

package/jimmy/nullmailer/nullmailer.conf

@@ -33,8 +33,8 @@ nullmailer_premake() {
 	# these can't be done via .patch because of localqueue conflicts
 	for i in Makefile src/Makefile doc/Makefile ; do
 		mv $i $i.orig
-		sed -re 's/(mailq|sendmail)([ \:]+|\.1|$)/\1_nullmailer\2/' \
-		  $i.orig > $i
+		sed -i -re 's/(mailq|sendmail)([ \:]+|\.1|$)/\1_nullmailer\2/' \
+		           $i
 	done
 	mv doc/sendmail.1 doc/sendmail_nullmailer.1
 }

package/kasc/rocksndiamonds/rocksndiamonds.conf

@@ -33,8 +33,7 @@ var_append makeopt " " "RO_GAME_DIR=$datadir/rocksndiamonds RW_GAME_DIR=$scoredi
 
 rocksndiamonds_inmake() {
 # make install isnt avaliable, yet. author promised to fix that ;)
-  rm -Rf $datadir/rocksndiamonds /var/games/rocksndiamonds
-  mkdir -p $datadir/rocksndiamonds /var/games/rocksndiamonds
+  mkdir -p $datadir/rocksndiamonds $root/var/games/rocksndiamonds
   mkdir -p $scoredir
   mv -f graphics levels music sounds $datadir/rocksndiamonds/
   mv -f scores $scoredir
@@ -47,6 +46,5 @@ makeinstopt=""
 premake="make clean"
 inmake=rocksndiamonds_inmake
 
-
 # targets: sdl, x11, solaris, solaris-sdl, mac
 

package/mathieu/kanjipad/kanjipad.conf

@@ -22,3 +22,4 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 hook_add premake 3 "sed -ie 's,^PREFIX=/usr/local,PREFIX=$root/$prefix,' Makefile"
+

package/misc/snort/snort.conf

@@ -60,9 +60,7 @@ fi
 snort_premake()
 {	
 	# Comply with FHS for /var/opt/
-	sed 's/\/var\/log\/snort/\/var\/opt\/snort\/log/' src/snort.h > \
-	  src/snort.h.new
-	mv -f src/snort.h{.new,}
+	sed -i 's/\/var\/log\/snort/\/var\/opt\/snort\/log/' src/snort.h
 }	
 
 snort_postmake()
@@ -87,9 +85,7 @@ snort_postmake()
 	# FIS THIS PROPERLY!
 	# mv /opt/snort/etc/etc/* /opt/snort/etc/
 	# rm -rf /opt/snort/etc/etc/	
-	sed 's/\.\.\/rules/.\/rules/' $root/$prefix/etc/snort.conf > \
-		$root/$prefix/etc/snort.conf.new
-	mv -f $root/$prefix/etc/snort.conf{.new,}
+	sed -i 's/\.\.\/rules/.\/rules/' $root/$prefix/etc/snort.conf
 
 	# THIS IS DANGEROUS - IT MIGHT AFFECT OTHER PACKAGES FILES !!!
 	# Remove Makefiles (left from build)

package/mnemoc/runit/runit.conf

@@ -116,16 +116,14 @@ if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then
 	hook_add premake 5 "for x in ./doc/debian/*; do \
 	if [ -f \$x ]; then	\
 		echo Fixing \$x... ;	\
-		sed -e 's,/var/service,/service,g' \$x > \$x.new ;	\
-		mv -f \$x.new \$x ; \
+		sed -i -e 's,/var/service,/service,g' \$x ; \
 	fi	; \
 	done"
 else
 	hook_add premake 5 "for x in ./doc/debian/*; do \
 	if [ -f \$x ]; then	\
 		echo Fixing \$x... ;	\
-		sed -e 's,/command:,,g' \$x > \$x.new ;	\
-		mv -f \$x.new \$x ; \
+		sed -i -e 's,/command:,,g' \$x ;	\
 	fi	; \
 	done"
 fi
@@ -137,3 +135,4 @@ custmain="pkg_runit_main"
 postdoc="pkg_runit_doc"
 
 createdocs=1
+

package/powerpc/pbbuttons/pbbuttons.conf

@@ -20,17 +20,15 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-pbbuttons_pm(){
+pbbuttons_pm() {
 	install_init pbbuttonsd $confdir/pbbuttonsd.init
 
 	echo "Modifing $confdir/pbbuttonsd.conf to be DevFS-aware ..."
-	cat $sysconfdir/pbbuttonsd.conf > $sysconfdir/pbbuttonsd.conf.tmp
-	sed -e s,/dev/hda\([0-9]\),/dev/discs/disc0/part\1, \
-	    -e s,/dev/hda,/dev/discs/disc0/disc, \
-	    -e s,/dev/mixer,/dev/sound/mixer, \
-	    -e s,/dev/pmu,/dev/misc/pmu, \
-	    $sysconfdir/pbbuttonsd.conf.tmp > $sysconfdir/pbbuttonsd.conf
-	rm $sysconfdir/pbbuttonsd.conf.tmp
+	sed -i -e s,/dev/hda\([0-9]\),/dev/discs/disc0/part\1, \
+	       -e s,/dev/hda,/dev/discs/disc0/disc, \
+	       -e s,/dev/mixer,/dev/sound/mixer, \
+	       -e s,/dev/pmu,/dev/misc/pmu, \
+	       $sysconfdir/pbbuttonsd.conf
 }
 
 postmake="pbbuttons_pm"

package/praenti/nedit/nedit.conf

@@ -22,20 +22,17 @@
 
 nedit_main()
 {
+	echo "patching Makefile ..."
+	patch -p1 < $confdir/nedit-5.3-makefile.diff
 
-echo "patching Makefile ..."
-patch -p1 < $confdir/nedit-5.3-makefile.diff
-
-cp makefiles/Makefile.linux .
-sed "s:-O:${CFLAGS} -D__LINUX__:" \
-	Makefile.linux > makefiles/Makefile.linux
+	sed -i "s:-O:${CFLAGS} -D__LINUX__:" makefiles/Makefile.linux
 	
-eval $MAKE linux
-
-cp -v source/nc $root/usr/bin
-cp -v source/nedit $root/usr/bin
+	eval $MAKE linux
 
+	cp -v source/nc $root/usr/bin
+	cp -v source/nedit $root/usr/bin
 }
 
 srctar="nedit-${ver}-source.tar.bz2"
 custmain="nedit_main"
+

package/rene/edb/e17.conf

@@ -14,6 +14,5 @@ fi
 # needed since e17 is currently CVS checkout only ...
 # and fixup the damn autogen.sh ...
 
-preconf="cp autogen.sh autogen.sh.old
-sed s/$USER/stupid/ autogen.sh.old > autogen.sh
+preconf="sed -i s/$USER/stupid/ autogen.sh ;
 sh autogen.sh $confopt --enable-cxx"

package/rene/etcher/etcher.conf

@@ -20,10 +20,10 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 . $base/package/*/imlib2/e17.conf
 
 etcher_aclocal_include_extra=/$ROCKCFG_PKG_GNOME14_CORE_PREFIX/share/aclocal/
-preconf="cp autogen.sh autogen.sh.old
-sed -e 's/aclocal \$aclocalinclude/MARKER/' -e \"s%MARKER%aclocal \\\$aclocalinclude -I $etcher_aclocal_include_extra%\" autogen.sh.old > autogen.sh
-$preconf"
+
+hook_add preconf 3 "sed -i -e 's/aclocal \$aclocalinclude/MARKER/' \
+                           -e \"s%MARKER%aclocal \\\$aclocalinclude -I $etcher_aclocal_include_extra%\" autogen.sh"
+

package/rene/imlib2/e17.conf

@@ -14,7 +14,5 @@ fi
 # needed since e17 is currently CVS checkout only ...
 # and fixup the damn autogen.sh ...
 
-preconf="cp autogen.sh autogen.sh.old
-sed s/$USER/stupid/ autogen.sh.old > autogen.sh
-sh autogen.sh $enablecxx"
+preconf="sed -i s/$USER/stupid/ autogen.sh ; sh autogen.sh $enablecxx"
 

package/rene/mew/mew.conf

@@ -25,7 +25,7 @@ mew_main()
 	eval $MAKE ; eval $MAKE install
 	eval $MAKE info ; eval $MAKE install-info ; eval $MAKE install-etc
 	
-	cat contrib/mewinc | sed "s,local/bin,bin,g" > /usr/bin/mewinc
+	cat contrib/mewinc | sed "s,local/bin,bin,g" > $bindir/mewinc
 }
 
 custmain="mew_main"

package/tibit/g-wrap/g-wrap.conf

@@ -25,8 +25,7 @@ gwrap_main() {
   tar $taropt $archdir/slib2d5.tar.bz2
   mkdir -p $root/usr/share/guile/slib
   cd slib
-  sed "s,/usr/local/lib/slib,$root/usr/share/guile/slib," Template.scm > Template.scm.new
-  mv -f Template.scm.new Template.scm
+  sed -i "s,/usr/local/lib/slib,$root/usr/share/guile/slib," Template.scm
   for i in *.scm; do
     ginstall -m 644 $i $root/usr/share/guile/slib
   done

package/tsa/yp-tools/yp-tools.conf

@@ -20,7 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 # avoid a shared-files conflict with net-tools
 var_append INSTALL_WRAPPER_FILTER "|" \
 	'sed -e "s,bin/\(nis\|yp\|\)\(domainname\)$,bin/yp-\1\2,"'

package/x11/gv/gv.conf

@@ -20,12 +20,9 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 gv_main() {
 	cp doc/gv.man source
-	mv config.Unix config.Unix.orig
-	sed 's,/usr/local/,/usr/,' < config.Unix.orig \
-		> config.Unix
+	sed -i 's,/usr/local/,/usr/,' config.Unix
 	cd source; ./inc_2lit; cd ..
 }
 

package/x11/mozilla/home-bookmarks.patch

@@ -6,17 +6,14 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/mozilla/home-bookmarks.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/mozilla/mozilla.conf

@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/mozilla/mozilla.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,9 +25,7 @@ main_mozilla() {
 	export MOZILLA_FIVE_HOME=$root/usr/lib/mozilla-$ver
 
 	# replace the 00... build-id with s.th. useful
-	sed "s,0000000000,ROCK Linux - $rockver," \
-		xpfe/global/build.dtd.in > xpfe/global/build.dtd.in.new
-	mv xpfe/global/build.dtd.in.new xpfe/global/build.dtd.in
+	sed -i "s,0000000000,ROCK Linux - $rockver," xpfe/global/build.dtd.in
 
 	cp security/coreconf/Linux2.5.mk security/coreconf/Linux2.6.mk
 

package/x11/mozilla/mozilla.desc

@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/x11/mozilla/mozilla.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[I] Fullfeatured (but fat and slow)  web browser
+[I] Fullfeatured (but fat and slow) web browser
 
 [T] Mozilla is one of the most exciting WWW developments at this point.
 [T] Completely redesigned from scratch it makes a stable and easily

package/x11/mozilla/set-ldpath.patch.disabled

@@ -6,17 +6,14 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/x11/mozilla/set-ldpath.patch.disabled
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 

package/x11/tcltk/tcltk.conf

@@ -21,12 +21,10 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 fix_doc() {
-	mv Makefile.in Makefile.in.tmp
-	mv mkLinks mkLinks.tmp
-	sed "s,\(MAN[13N]_INSTALL_DIR)\)/\$\$i,\\1/\$\${i}$1,g" \
-		< Makefile.in.tmp > Makefile.in
-	sed "s,\([.][13n]\),\\1$1,g" \
-		< mkLinks.tmp > mkLinks
+	sed -i "s,\(MAN[13N]_INSTALL_DIR)\)/\$\$i,\\1/\$\${i}$1,g" \
+		Makefile.in
+	sed -i "s,\([.][13n]\),\\1$1,g" \
+		mkLinks
 }
 
 main_tcltk() {

package/x86/icc/icc.conf

@@ -20,7 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 pkg_icc_main() {
 	mkdir -p rpm_files ; cd rpm_files
 
@@ -47,8 +46,7 @@ pkg_icc_main() {
 	echo "Creating /opt/intel/{bin,lib} and make final adaptions ..."
 	for x in $( find $root/opt/intel/compiler60/ia??/bin/ -regex \
 		'.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' ) ; do
-			sed 's@<INSTALLDIR>@/opt/intel@g' < $x > $x.new
-			cat $x.new > $x ; rm -f $x.new
+			sed -i 's@<INSTALLDIR>@/opt/intel@g' $x
 	done
 	(	mkdir -p $root/opt/intel/bin ; cd $root/opt/intel/bin
 		ln -sf ../compiler60/ia32/bin/* .

package/x86/lilo/lilo.conf

@@ -31,13 +31,11 @@ pm_lilo() {
 
 pc_lilo() {
 	if [ "$ROCKCFG_PKG_LILO_READONLY" = 1 ] ; then
-		mv Makefile Makefile.orig
-		sed -e "s/-DREWRITE_TABLE/-DREADONLY/" Makefile.orig > Makefile
+		sed -i -e "s/-DREWRITE_TABLE/-DREADONLY/" Makefile
 	fi
 	if [ "$ROCKCFG_PKG_LILO_XL_SECS" ] ; then
-		mv Makefile Makefile.orig
-		sed -e "s/-DVIRTUAL/-DVIRTUAL -DXL_SECS=$ROCKCFG_PKG_LILO_XL_SECS/" \
-		   Makefile.orig > Makefile
+		sed -i -e "s/-DVIRTUAL/-DVIRTUAL -DXL_SECS=$ROCKCFG_PKG_LILO_XL_SECS/" \
+		   Makefile
 	fi
 }
 

package/xfce4/xfce-mcs-plugins/xfce-mcs-plugins.conf

@@ -23,9 +23,7 @@
 . $base/package/*/*/xfce-4.conf
 
 xfmp4_sans11() {
-	mv plugins/ui_plugin/ui_plugin.c plugins/ui_plugin/ui_plugin.c.orig
-	sed -e "/DEFAULT_FONT/s/10/11/" plugins/ui_plugin/ui_plugin.c.orig \
-		> plugins/ui_plugin/ui_plugin.c
+	sed -i -e "/DEFAULT_FONT/s/10/11/" plugins/ui_plugin/ui_plugin.c
 }
 
 [ "$ROCKCFG_PKG_XFCE4_SANS11" = 1 ] && hook_add preconf 3 xfmp4_sans11

package/xfce4/xfwm4/xfwm4.conf

@@ -23,9 +23,7 @@
 . $base/package/*/*/xfce-4.conf
 
 xfwm4_sans11() {
-	mv mcs-plugin/xfwm4_plugin.c mcs-plugin/xfwm4_plugin.c.orig
-	sed -e "/DEFAULT_FONT/s/10/11/" mcs-plugin/xfwm4_plugin.c.orig \
-		> mcs-plugin/xfwm4_plugin.c
+	sed -i -e "/DEFAULT_FONT/s/10/11/" mcs-plugin/xfwm4_plugin.c
 }
 
 [ "$ROCKCFG_PKG_XFCE4_SANS11" = 1 ] && hook_add preconf 3 xfwm4_sans11