ppcrcd/trunk: base.pkgs net.pkgs

[sparky]

Author: sparky
Date: Sat Jan  7 04:43:16 2006
New Revision: 6757

Modified:
   ppcrcd/trunk/base.pkgs
   ppcrcd/trunk/net.pkgs
Log:
- cleanups and yet more fixes, I should go sleep


Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs	(original)
+++ ppcrcd/trunk/base.pkgs	Sat Jan  7 04:43:16 2006
@@ -316,7 +316,7 @@
 
 $(P)/busybox: out/rpm/sources/busybox
 	sed -e '/ifnarch/s/$$/ ppc/' \
-		-i $(OUT)/rpm/SPECS/busybox.spec
+		-i out/rpm/SPECS/busybox.spec
 	touch $@
 
 out/touch/kerneleq:

Modified: ppcrcd/trunk/net.pkgs
==============================================================================
--- ppcrcd/trunk/net.pkgs	(original)
+++ ppcrcd/trunk/net.pkgs	Sat Jan  7 04:43:16 2006
@@ -49,18 +49,14 @@
 
 I +=	ppp ppp-plugin-pppoatm
 # -pppoatm
-#.ppp_prep: .ppp_pre .pppneq
-#	touch $@
-$(R)/ppp $(R)/ppp-plugin-pppoatm:	$(P)/ppp
+$(R)/ppp $(R)/ppp-plugin-pppoatm:	$(P)/ppp pppneq
 
 I +=	speedtouch
 $(R)/speedtouch:	$(P)/speedtouch
 
 
 I +=	ppp-plugin-ifcfg-password
-.ppp-plugin-ifcfg-password_prep:	.ppp-plugin-ifcfg-password_pre .pppeq
-	touch $@
-$(R)/ppp-plugin-ifcfg-password:	$(P)/ppp-plugin-ifcfg-password
+$(R)/ppp-plugin-ifcfg-password:	$(P)/ppp-plugin-ifcfg-password out/touch/pppeq
 
 I +=	rp-pppoe
 $(R)/rp-pppoe:	$(P)/rp-pppoe
@@ -220,7 +216,7 @@
 I +=	ekg2 ekg2-plugin-protocol-gg ekg2-plugin-protocol-irc \
 	ekg2-plugin-protocol-jabber ekg2-plugin-sim
 BCOND-ekg2 = --without aspell --without python --without sqlite \
-	--without xosd --without libgsm
+	--without xosd --without libgsm --without gnutls
 # +yesterday_snapshot -aspell -gadugadu -jabber -libgsm -python -sqlite -xosd
 $(R)/ekg2 $(R)/ekg2-plugin-protocol-gg $(R)/ekg2-plugin-protocol-irc: $(P)/ekg2
 $(R)/ekg2-plugin-protocol-jabber $(R)/ekg2-plugin-sim:	$(P)/ekg2
@@ -229,23 +225,16 @@
 BCOND-iptables = --without doc
 # -doc -dist_kernel
 S +=	iptables ip6tables
-.iptables_prep: .iptables_pre .kerneleq
-	touch $@
-$(R)/iptables $(R)/iptables-init:	$(P)/iptables
-
+$(R)/iptables $(R)/iptables-init:	$(P)/iptables out/touch/kerneleq
 
 
-.ekg2_prep: .ekg2_pre
-	sed -n -e '/gnutls-devel/!p' \
-		-i rpm/SPECS/ekg2.spec
-	touch $@
-
-.pppeq:
+out/touch/pppeq:
 	-$(SU) rpm --erase ppp-plugin-devel
-	$(SU) rpm -Uhv `cat .ppp-plugin-devel_rpm`
+	$(SU) rpm -Uhv `cat our/rpm/rpms/ppp-plugin-devel`
 	touch $@
 
-.pppneq:
-	rm -f .pppeq
+.PHONY: pppneq
+pppneq:
+	rm -f out/touch/pppeq
 
 # vim: syntax=make