Date: Wed, 19 Jan 2005 16:30:15 +0100 From: Florent Thoumie <flz@xbsd.org> To: pav@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/76419: Update port: net/netboot - fix packing list Message-ID: <41EE7D07.6050104@xbsd.org> In-Reply-To: <1106145966.21025.4.camel@pav.hide.vol.cz> References: <200501191355.j0JDt7eI015114@freefall.freebsd.org> <41EE6E68.7010005@xbsd.org> <1106145966.21025.4.camel@pav.hide.vol.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------010702090808020602070209
Content-Type: text/plain; charset=ISO-8859-2; format=flowed
Content-Transfer-Encoding: 7bit
Pav Lucistnik wrote:
> Better but still not good enough. Please also install ${nbconfig} and
> remove it on deinstall if it's unchanged. See other ports' plists for
> @exec cmp lines.
There's no guidelines in the PH about how to install
documentation. I've seen a lot of ports using cmp to remove
files if they haven't changed but I don't think that's a good
solution.
That's good for netboot, since there's only one file to check,
but for ports installing more than one file, that could lead to
half of the configuration being removed.
I think installing documentation in ${EXAMPLESDIR} is sexier
but it's not widely used in the ports from what I've read.
BTW, here's the new diff.
--------------010702090808020602070209
Content-Type: text/plain;
name="netboot-v3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="netboot-v3.diff"
diff -ruN netboot.orig/Makefile netboot/Makefile
--- netboot.orig/Makefile Wed Jan 19 15:10:43 2005
+++ netboot/Makefile Wed Jan 19 16:29:57 2005
@@ -16,8 +16,28 @@
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
MAN5= netboot.5 netboot.config.5 netboot.drivers.5 netboot.db.5
MAN8= mknbi-mgl.8 makerom.8 mknbi-dos.8 mknbi-linux.8
+
+post-patch:
+ ${REINPLACE_CMD} -e "s#-o bin -g bin##" \
+ ${WRKSRC}/bootrom/Makefile \
+ ${WRKSRC}/bootrom/netdrvr/ndis2/drivers/Makefile \
+ ${WRKSRC}/bootrom/netdrvr/pktdrvr/drivers/Makefile \
+ ${WRKSRC}/bootrom/netdrvr/undi/drivers/Makefile \
+ ${WRKSRC}/makerom/Makefile \
+ ${WRKSRC}/misc/Makefile \
+ ${WRKSRC}/misc/instdrv \
+ ${WRKSRC}/misc/romcheck/Makefile.in \
+ ${WRKSRC}/mknbi-dos/Makefile \
+ ${WRKSRC}/mknbi-linux/Makefile \
+ ${WRKSRC}/mknbi-mgl/Makefile.in
+
+post-install:
+ @if [ ! -f ${PREFIX}/etc/netboot.config ]; then \
+ ${CP} ${PREFIX}/etc/netboot.config-dist ${PREFIX}/etc/netboot.config; \
+ fi
.include <bsd.port.mk>
diff -ruN netboot.orig/files/patch-misc::Makefile netboot/files/patch-misc::Makefile
--- netboot.orig/files/patch-misc::Makefile Thu Jan 1 01:00:00 1970
+++ netboot/files/patch-misc::Makefile Wed Jan 19 15:24:51 2005
@@ -0,0 +1,11 @@
+--- misc/Makefile.orig Wed Jan 19 15:24:01 2005
++++ misc/Makefile Wed Jan 19 15:24:27 2005
+@@ -77,7 +77,7 @@
+ $(INSTALL) -d $(sysconfdir)
+ $(INSTALL) -d $(nblibdir)
+ $(INSTALL) -d $(mandir)/man$(MANEXT)
+- $(INSTALL) -m 644 -o bin -g bin $(nbconfig) $(sysconfdir)/$(nbconfig)
++ $(INSTALL) -m 644 -o bin -g bin $(nbconfig) $(sysconfdir)/$(nbconfig)-dist
+ $(INSTALL) -m 644 -o bin -g bin $(drivers) $(nblibdir)/$(drivers)
+ $(INSTALL) -m 644 -o bin -g bin netboot.man $(mandir)/man$(MANEXT)/netboot.$(MANEXT)
+ $(INSTALL) -m 644 -o bin -g bin $(nbconfig).man $(mandir)/man$(MANEXT)/$(nbconfig).$(MANEXT)
diff -ruN netboot.orig/pkg-plist netboot/pkg-plist
--- netboot.orig/pkg-plist Wed Jan 19 15:10:40 2005
+++ netboot/pkg-plist Wed Jan 19 15:57:01 2005
@@ -2,6 +2,9 @@
bin/mknbi-dos
bin/mknbi-linux
bin/mknbi-mgl
+@unexec if cmp -s %D/etc/netboot.config %D/etc/netboot.config-dist; then rm -f %D/etc/netboot.config; fi
+etc/netboot.config-dist
+@exec [ -f %B/netboot.config ] || cp %B/%f %B/netboot.config
lib/netboot/netboot.drivers
lib/netboot/binaries/floppy.bin
lib/netboot/binaries/floppy86.bin
--------------010702090808020602070209--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41EE7D07.6050104>