diff options
| author | mr <mr@FreeBSD.org> | 2003-09-23 16:17:36 +0800 |
|---|---|---|
| committer | mr <mr@FreeBSD.org> | 2003-09-23 16:17:36 +0800 |
| commit | 6e20cfcc1405b67404d424f2e9bf3448a8f1960a (patch) | |
| tree | cfde88889a918ebdd0af12dd5179d10d784de9fa /net | |
| parent | 1d8e8465ef04cee24a552802613423d43c27a899 (diff) | |
| download | freebsd-ports-gnome-6e20cfcc1405b67404d424f2e9bf3448a8f1960a.tar.gz freebsd-ports-gnome-6e20cfcc1405b67404d424f2e9bf3448a8f1960a.tar.zst freebsd-ports-gnome-6e20cfcc1405b67404d424f2e9bf3448a8f1960a.zip | |
Unbreak nitpicker which user mkdirhier for installing the programs.
Replace `mkdirhier` with `mkdir -p`.
Include ports/56723 which avoids the fragile install targets
by using ${INSTALL_PROGRAMM}.
Install parse_flowfile.
PR: ports/56723
Submitted by: Simon Barner <barner@in.tum.de>
Approved by: kris
Diffstat (limited to 'net')
| -rw-r--r-- | net/nitpicker/Makefile | 9 | ||||
| -rw-r--r-- | net/nitpicker/files/patch-aa | 11 | ||||
| -rw-r--r-- | net/nitpicker/files/patch-ad | 11 | ||||
| -rw-r--r-- | net/nitpicker/files/patch-ae | 9 |
4 files changed, 35 insertions, 5 deletions
diff --git a/net/nitpicker/Makefile b/net/nitpicker/Makefile index de508ffa5e74..5a2b9552b12c 100644 --- a/net/nitpicker/Makefile +++ b/net/nitpicker/Makefile @@ -16,4 +16,11 @@ COMMENT= IP flow Accounting tools NO_MAN= YES -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/nitpicker ${LOCALBASE}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/tools/parse_flowfile/src/parse_flowfile ${LOCALBASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/tools/dumpit/dumpit ${LOCALBASE}/bin + +.include <bsd.port.post.mk> diff --git a/net/nitpicker/files/patch-aa b/net/nitpicker/files/patch-aa index 7908156382cc..bcec6e517d14 100644 --- a/net/nitpicker/files/patch-aa +++ b/net/nitpicker/files/patch-aa @@ -1,5 +1,5 @@ ---- src/Makefile.orig Sat Aug 23 10:37:21 2003 -+++ src/Makefile Sat Aug 23 10:38:52 2003 +--- src/Makefile.orig Sat Jul 5 02:56:12 2003 ++++ src/Makefile Tue Sep 23 09:48:56 2003 @@ -1,8 +1,8 @@ TARGET = nitpicker @@ -11,3 +11,10 @@ +CFLAGS += $(INCLUDES) -pthread PREFIX = /usr/local/ INCDIR= ${.CURDIR}/../include +@@ -31,5 +31,5 @@ + install: + @echo "Your Binaries will be installed into $(PREFIX)/sbin" +- mkdirhier $(PREFIX)/sbin ++ mkdir -p $(PREFIX)/sbin + cp nitpicker $(PREFIX)/sbin + diff --git a/net/nitpicker/files/patch-ad b/net/nitpicker/files/patch-ad index d2247c99b8b2..ffb6df2cebc5 100644 --- a/net/nitpicker/files/patch-ad +++ b/net/nitpicker/files/patch-ad @@ -1,5 +1,5 @@ ---- tools/dumpit/Makefile.orig Sat Aug 23 19:34:32 2003 -+++ tools/dumpit/Makefile Sat Aug 23 19:35:43 2003 +--- tools/dumpit/Makefile.orig Fri May 23 10:54:06 2003 ++++ tools/dumpit/Makefile Tue Sep 23 09:49:32 2003 @@ -1,8 +1,7 @@ TARGET = dumpit @@ -11,3 +11,10 @@ +CFLAGS += $(INCLUDES) #CFLAGS += -DDEBUG # Debugging +@@ -20,5 +19,5 @@ + + install: +- mkdirhier $(PREFIX)/bin && cp dumpit $(PREFIX)/bin ++ mkdir -p $(PREFIX)/bin && cp dumpit $(PREFIX)/bin + + $(OBJS): $(HDRS) diff --git a/net/nitpicker/files/patch-ae b/net/nitpicker/files/patch-ae new file mode 100644 index 000000000000..56f591257d21 --- /dev/null +++ b/net/nitpicker/files/patch-ae @@ -0,0 +1,9 @@ +--- Makefile.orig Fri May 23 10:48:47 2003 ++++ Makefile Tue Sep 23 10:02:57 2003 +@@ -18,6 +18,2 @@ + + install: +- @cd tools/dumpit; make install; +-# @cd tools/parse_flowfile; make install; +- @cd src; make install; +- |