diff options
author | wennmach <wennmach> | 2002-01-29 18:24:29 +0000 |
---|---|---|
committer | wennmach <wennmach> | 2002-01-29 18:24:29 +0000 |
commit | be390fb7529e718080016fa5ffd8d9eb3c98655b (patch) | |
tree | 3a441642c59f771c6f3195d50701a7051a3bd6d0 /sysutils/fdgw | |
parent | 03ce3d41790e877d0f8afade293babf86c905225 (diff) | |
download | pkgsrc-be390fb7529e718080016fa5ffd8d9eb3c98655b.tar.gz |
Upgrade fdgw to fdgw-20020127
(provided by Ken'ichi Fukamachi <fukachan@fml.org>)
The new version provides cleaner Makefiles, contains all patches from
pkgsrc, and in addition adresses a missing directoy problem on the
netbsd-1-5 branch before September, 2001.
Diffstat (limited to 'sysutils/fdgw')
-rw-r--r-- | sysutils/fdgw/Makefile | 15 | ||||
-rw-r--r-- | sysutils/fdgw/distinfo | 10 | ||||
-rw-r--r-- | sysutils/fdgw/patches/patch-aa | 33 | ||||
-rw-r--r-- | sysutils/fdgw/patches/patch-ab | 15 | ||||
-rw-r--r-- | sysutils/fdgw/patches/patch-ac | 15 | ||||
-rw-r--r-- | sysutils/fdgw/patches/patch-ad | 19 |
6 files changed, 10 insertions, 97 deletions
diff --git a/sysutils/fdgw/Makefile b/sysutils/fdgw/Makefile index 8bac4536a9f..2388124cdd6 100644 --- a/sysutils/fdgw/Makefile +++ b/sysutils/fdgw/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/01/07 17:26:08 wennmach Exp $ +# $NetBSD: Makefile,v 1.3 2002/01/29 18:24:29 wennmach Exp $ # -DISTNAME= fdgw-20011216 -PKGREVISION= 1 +DISTNAME= fdgw-20020127 CATEGORIES= sysutils net MASTER_SITES= ftp://ftp.fml.org/pub/fdgw/source/ @@ -25,7 +24,7 @@ IGNORE= "Sorry, fdgw is currently only available for i386 machines." IGNORE+= "Please report to ${MAINTAINER} if you succeed to port fdgw to other architectures" .endif -# we need NetBSD source tree. +# we need the NetBSD source tree. .if !exists(${BSDSRCDIR}) IGNORE= "${PKGNAME} requires the NetBSD source tree in BSDSRCDIR (${BSDSRCDIR})" .endif @@ -34,10 +33,10 @@ ALL_TARGET= dist-build pre-fetch: @ ${ECHO} ""; - @ ${ECHO} "************************************"; + @ ${ECHO} "********************************************************"; @ ${ECHO} "Please note: The install stage of fdgw requires a kernel" @ ${ECHO} " with 'pseudo-device vnd 4' enabled."; - @ ${ECHO} "************************************"; + @ ${ECHO} "********************************************************"; @ ${ECHO} ""; pre-install: @@ -50,7 +49,7 @@ do-install: post-install: @ ${ECHO} ""; - @ ${ECHO} "************************************"; + @ ${ECHO} "*****************************************************"; @ ${ECHO} ""; @ ${ECHO} "The floppy images are installed into ${_IMG_DST_DIR}." @ ${ECHO} "" @@ -59,7 +58,7 @@ post-install: @ ${ECHO} ""; @ ${ECHO} "See ${HOMEPAGE} for more details, e.g. customization"; @ ${ECHO} ""; - @ ${ECHO} "************************************"; + @ ${ECHO} "*****************************************************"; @ ${ECHO} ""; .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/fdgw/distinfo b/sysutils/fdgw/distinfo index ec34776f7c5..9c9749eb748 100644 --- a/sysutils/fdgw/distinfo +++ b/sysutils/fdgw/distinfo @@ -1,8 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/01/07 17:26:08 wennmach Exp $ +$NetBSD: distinfo,v 1.3 2002/01/29 18:24:29 wennmach Exp $ -SHA1 (fdgw-20011216.tar.gz) = ce9558a53e319a51bc45ba447f84dc3950c87e3f -Size (fdgw-20011216.tar.gz) = 121201 bytes -SHA1 (patch-aa) = ff78fad260a48c4af2023859de429142136ec1b9 -SHA1 (patch-ab) = c343c8975bfbf0b7ca1f28b291f52b8874308c4e -SHA1 (patch-ac) = f647c6c84fc597be136b2087865b4920b6108ff5 -SHA1 (patch-ad) = fca672e74231950aad28daa3f3bb55a833ca2e0d +SHA1 (fdgw-20020127.tar.gz) = 7f08664ccfbd563474e47db11f9f1a6681d5c9db +Size (fdgw-20020127.tar.gz) = 121853 bytes diff --git a/sysutils/fdgw/patches/patch-aa b/sysutils/fdgw/patches/patch-aa deleted file mode 100644 index 42576465579..00000000000 --- a/sysutils/fdgw/patches/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/26 11:45:22 wennmach Exp $ - -Don't lndir to all of NetBSD src. - ---- src/Makefile.orig Sun Dec 23 18:23:56 2001 -+++ src/Makefile Sun Dec 23 18:30:59 2001 -@@ -28,6 +28,9 @@ - # dir to lndir - _BSDSRCDIR= ${PWD}/NetBSD - -+# individual directories to link to -+_DIRS=etc bin/cat bin/cp bin/chmod bin/csh bin/date bin/df bin/echo bin/ed bin/expr bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/ps bin/pwd bin/rm bin/sh bin/sleep bin/stty bin/sync bin/test dist/dhcp dist/ipf distrib/utils distrib/i386/floppies sbin/ifconfig sbin/init sbin/mount sbin/mount_ffs sbin/mount_kernfs sbin/mount_msdos sbin/umount sbin/ping sbin/route sbin/reboot sbin/shutdown usr.bin/basename usr.bin/id usr.bin/less usr.bin/logger usr.bin/sed usr.bin/tty usr.bin/uname usr.sbin/chown usr.sbin/chroot usr.sbin/dhcp usr.sbin/ipf usr.sbin/pppd usr.sbin/syslogd lib/libpcap sys/netinet sys/arch/i386/stand -+ - _FLOPPY_DIR= ${_BSDSRCDIR}/distrib/${ARCH}/floppies - - _SYS_DIR= ${BSDSRCDIR}/sys -@@ -120,10 +123,12 @@ - - _lndir: - @ test -d ${_BSDSRCDIR} || mkdir -p ${_BSDSRCDIR} -- @ echo lndir ${BSDSRCDIR} ${_BSDSRCDIR} -- @ if [ ! -f ${_BSDSRCDIR}/.lndir_done ]; then \ -- lndir ${BSDSRCDIR} ${_BSDSRCDIR};\ -- fi -+ for DIR in ${_DIRS} ; do \ -+ test -d ${_BSDSRCDIR}/$$DIR || mkdir -p ${_BSDSRCDIR}/$$DIR; \ -+ lndir ${BSDSRCDIR}/$$DIR ${_BSDSRCDIR}/$$DIR; \ -+ done -+ (cd ${_BSDSRCDIR}/distrib; ln -s -f ${BSDSRCDIR}/distrib/Makefile.inc) -+ (cd ${_BSDSRCDIR}; ln -s -f ${BSDSRCDIR}/Makefile.inc) - @ touch ${_BSDSRCDIR}/.lndir_done - - _init_dir: diff --git a/sysutils/fdgw/patches/patch-ab b/sysutils/fdgw/patches/patch-ab deleted file mode 100644 index f414d0340d6..00000000000 --- a/sysutils/fdgw/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/12/26 11:45:22 wennmach Exp $ - -Remove unused directory gnu/usr.bin from srcdirs. - ---- model/adslrouter/ramdiskbin.conf.orig Mon Dec 24 00:21:34 2001 -+++ model/adslrouter/ramdiskbin.conf Mon Dec 24 00:21:47 2001 -@@ -11,7 +11,7 @@ - # ramdiskbin.conf - unified binary for the install ramdisk - # - --srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin -+srcdirs bin sbin usr.bin/less usr.bin usr.sbin - srcdirs sys/arch/__ARCH__/stand - srcdirs usr.sbin/ipf - srcdirs usr.sbin/pppd diff --git a/sysutils/fdgw/patches/patch-ac b/sysutils/fdgw/patches/patch-ac deleted file mode 100644 index fd7b999c3fe..00000000000 --- a/sysutils/fdgw/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/12/26 11:45:22 wennmach Exp $ - -Remove unused directory gnu/usr.bin from srcdirs. - ---- model/natbox/ramdiskbin.conf.orig Mon Dec 24 00:34:27 2001 -+++ model/natbox/ramdiskbin.conf Mon Dec 24 00:35:01 2001 -@@ -11,7 +11,7 @@ - # ramdiskbin.conf - unified binary for the install ramdisk - # - --srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin -+srcdirs bin sbin usr.bin/less usr.bin usr.sbin - srcdirs sys/arch/__ARCH__/stand - srcdirs usr.sbin/ipf - srcdirs usr.sbin/pppd diff --git a/sysutils/fdgw/patches/patch-ad b/sysutils/fdgw/patches/patch-ad deleted file mode 100644 index 1788843fc46..00000000000 --- a/sysutils/fdgw/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/01/07 17:26:08 wennmach Exp $ - -"make clean" first, we don't really know what's left over from a -previous build in $BSDSRCDIR. Also, don't "make -j 4" (improves -log file legibillity for debugging purposes). - ---- src/Makefile.kernel.orig Fri Jan 4 10:48:02 2002 -+++ src/Makefile.kernel Fri Jan 4 10:51:18 2002 -@@ -29,8 +29,9 @@ - cp -p ${_KERNEL_CONF} ${.WORKDIR}/CONFIG - (cd ${.WORKDIR}; \ - config -s ${_SYS_DIR} ;\ -+ make clean;\ - make depend;\ -- make -j 4 \ -+ make \ - ) - - |