Version bump, modified bristuff 0.3.0-PRE1c patch to apply.

(Portage version: 2.0.51.22-r2)

2 files changed, 120 insertions, 0 deletions

diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.1 b/net-misc/zaptel/files/digest-zaptel-1.2.1
new file mode 100644
index 000000000000..55f521812b54
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.1
@@ -0,0 +1,3 @@
+MD5 efabb39a05d4c51f1e9d7d55ac097e2c zaptel-1.2.1.tar.gz 617212
+MD5 97b25f6bc1df0a962383b1bc930266b9 bristuff-0.3.0-PRE-1c.tar.gz 167219
+MD5 021421e8b07547d907c4378e9bed2d43 zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
diff --git a/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
new file mode 100644
index 000000000000..9cf6c0a83fc7
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
@@ -0,0 +1,117 @@
+--- zaptel-1.2.1/Makefile.orig	2005-12-04 20:29:27.000000000 +0100
++++ zaptel-1.2.1/Makefile	2005-12-14 19:45:38.000000000 +0100
+@@ -21,7 +21,7 @@
+ endif
+ KINCLUDES:=$(KSRC)/include
+ 
+-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
++CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+ CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+@@ -55,31 +55,7 @@
+   BUILDVER:=linux24
+ endif
+ 
+-ifeq ($(BUILDVER),linux26)
+-  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
+-    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
+-  else
+-    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
+-      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
+-    else
+-      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
+-        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
+-      else
+-        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
+-          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
+-        endif
+-      endif
+-    endif
+-  endif
+-else # BUILDVER == linux24
+-  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
+-    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
+-   else
+-    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
+-      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
+-     endif
+-  endif
+-endif
++MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
+ 
+ ifeq (${BUILDVER},linux24)
+ #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
+@@ -87,7 +63,7 @@
+ endif
+ ifeq (${BUILDVER},linux26)
+ #Tests for newer linux-2.6 udev support
+-DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
++DYNFS:=$(shell ps ax | grep -v grep | grep -q udevd && echo "yes")
+ endif
+ 
+ CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
+@@ -302,7 +278,7 @@
+ 	@echo "**** If you are running udev, read README.udev"
+ endif
+ 
+-install: all devices
++install: devices
+ 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
+ 	if [ -f sethdlc-new ]; then \
+ 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
+@@ -329,39 +305,22 @@
+ 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
+ 	fi
+ 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+-	[ `id -u` = 0 ] && /sbin/ldconfig || :
++	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
+ 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+ 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+-	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
+ 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+ 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+-	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
+-	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
++	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
++	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
++	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
+ 	if [ -n "$(MODCONF)" ]; then \
+-		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
+-		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
+-		grep -v "post-install torisa /sbin/ztcfg" | \
+-		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
+-		grep -v "alias wctdm" | \
+-		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
+ 		if ! grep "options torisa" $(MODCONF); then \
+ 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
+ 		fi; \
+ 		if ! grep "alias char-major-196" $(MODCONF); then \
+ 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
+ 		fi; \
+-		for x in $(MODULES); do \
+-			if ! grep -q "post-install $$x" $(MODCONF); then \
+-				if ! grep -q "install $$x " $(MODCONF); then \
+-					if [ "$$x" != "zaptel" ] ; then \
+-						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
+-						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
+-						fi; \
+-					fi; \
+-				fi; \
+-			fi; \
+-		done; \
+ 		if ! grep "ias wcfxs" $(MODCONF); then \
+ 			echo "alias wcfxs wctdm" >> $(MODCONF); \
+ 		fi; \
+@@ -369,10 +328,6 @@
+ 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
+ 		fi; \
+ 	fi
+-	if [ -d /etc/modutils ]; then \
+-		/sbin/update-modules ; \
+-	fi
+-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+ 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+ 
+ install-udev: