Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w

1 files changed, 32 insertions, 32 deletions

diff --git a/mgetty/mgetty_1.1.30.oe b/mgetty/mgetty_1.1.30.oe
index 63e529a38e..4f778c7bb6 100644
--- a/mgetty/mgetty_1.1.30.oe
+++ b/mgetty/mgetty_1.1.30.oe
@@ -3,41 +3,41 @@ DESCRIPTION = "The mgetty package contains an intelligent \
 getty for allowing logins over a serial line (such as \
 through a modem) and receiving incoming faxes."
 
-#SRC_URI = ftp://alpha.greenie.net/pub/mgetty/source/1.0/mgetty+sendfax-${PV}.tar.gz
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz \
-	   file://${FILESDIR}/debian.patch;patch=1 \
-	   file://${FILESDIR}/00-g3_Makefile;patch=1 \
-	   file://${FILESDIR}/01-adjust-path;patch=1 \
-	   file://${FILESDIR}/02-pending-fix-includes;patch=1 \
-	   file://${FILESDIR}/03-callback_Makefile;patch=1 \
-	   file://${FILESDIR}/04-new_fax.pbm;patch=1 \
-	   file://${FILESDIR}/06-pending-contrib_g3tolj.c;patch=1 \
-	   file://${FILESDIR}/07-pending-contrib_g3toxwd.c;patch=1 \
-	   file://${FILESDIR}/09-doc_Makefile;patch=1 \
-	   file://${FILESDIR}/10-doc_faxrunqd.8in;patch=1 \
-	   file://${FILESDIR}/12-fax_faxrunqd.in;patch=1 \
-	   file://${FILESDIR}/13-fax_faxspool.in;patch=1 \
-	   file://${FILESDIR}/14-frontends_X11_viewfax-2.5_Makefile;patch=1 \
-	   file://${FILESDIR}/23-samples_new_fax.mime4;patch=1 \
-	   file://${FILESDIR}/24-voice_include_paths.h;patch=1 \
-	   file://${FILESDIR}/26-voice_libpvf_usr.c;patch=1 \
-	   file://${FILESDIR}/36-voice_voice.conf-dist;patch=1 \
-	   file://${FILESDIR}/37-Makefile;patch=1 \
-	   file://${FILESDIR}/39-mgetty.cfg.in;patch=1 \
-	   file://${FILESDIR}/40-locks.c_bug153394;patch=1 \
-	   file://${FILESDIR}/41-ugly-redo-ring.c_bug128668;patch=1 \
-	   file://${FILESDIR}/42-voice_libvoice_detect.c;patch=1 \
-	   file://${FILESDIR}/43-moreinfo-cnd.c_bug112163;patch=1 \
-	   file://${FILESDIR}/44-pending-faxexpand.h_bug169455;patch=1 \
-	   file://${FILESDIR}/45-logfile.c;patch=1 \
-	   file://${FILESDIR}/47-doc_mgetty.texi-in;patch=1 \
-	   file://${FILESDIR}/50-pending-voice-zoom-2949l-c;patch=1 \
-	   file://${FILESDIR}/51-pending-faxq-time;patch=1 \
-	   file://${FILESDIR}/52-pending-metamail;patch=1 \
-	   file://${FILESDIR}/install.patch;patch=1"
+           file://debian.patch;patch=1 \
+           file://00-g3_Makefile;patch=1 \
+           file://01-adjust-path;patch=1 \
+           file://02-pending-fix-includes;patch=1 \
+           file://03-callback_Makefile;patch=1 \
+           file://04-new_fax.pbm;patch=1 \
+           file://06-pending-contrib_g3tolj.c;patch=1 \
+           file://07-pending-contrib_g3toxwd.c;patch=1 \
+           file://09-doc_Makefile;patch=1 \
+           file://10-doc_faxrunqd.8in;patch=1 \
+           file://12-fax_faxrunqd.in;patch=1 \
+           file://13-fax_faxspool.in;patch=1 \
+           file://14-frontends_X11_viewfax-2.5_Makefile;patch=1 \
+           file://23-samples_new_fax.mime4;patch=1 \
+           file://24-voice_include_paths.h;patch=1 \
+           file://26-voice_libpvf_usr.c;patch=1 \
+           file://36-voice_voice.conf-dist;patch=1 \
+           file://37-Makefile;patch=1 \
+           file://39-mgetty.cfg.in;patch=1 \
+           file://40-locks.c_bug153394;patch=1 \
+           file://41-ugly-redo-ring.c_bug128668;patch=1 \
+           file://42-voice_libvoice_detect.c;patch=1 \
+           file://43-moreinfo-cnd.c_bug112163;patch=1 \
+           file://44-pending-faxexpand.h_bug169455;patch=1 \
+           file://45-logfile.c;patch=1 \
+           file://47-doc_mgetty.texi-in;patch=1 \
+           file://50-pending-voice-zoom-2949l-c;patch=1 \
+           file://51-pending-faxq-time;patch=1 \
+           file://52-pending-metamail;patch=1 \
+           file://install.patch;patch=1 \
+           file://voice-defs.h"
 
 do_compile () {
-        cp ${FILESDIR}/policy.h ${FILESDIR}/voice-defs.h .
+        cp ${WORKDIR}/policy.h ${WORKDIR}/voice-defs.h .
 	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
 	-I.. -DBINDIR=\"${bindir}\" -DSBINDIR=\"${sbindir}\" \
         -DLIBDIR=\"${libdir}/mgetty-fax\" \