diff options
author | pawel <pawel@FreeBSD.org> | 2014-07-11 06:14:30 +0800 |
---|---|---|
committer | pawel <pawel@FreeBSD.org> | 2014-07-11 06:14:30 +0800 |
commit | f95f63d11973679079a6b40742f9e8507df4a211 (patch) | |
tree | 820caa6823960d184e0af0c590b76feb5097f21f /security/ipfw2dshield | |
parent | a1dbd0455fae19931b41ec9502f1084e852883e5 (diff) | |
download | freebsd-ports-gnome-f95f63d11973679079a6b40742f9e8507df4a211.tar.gz freebsd-ports-gnome-f95f63d11973679079a6b40742f9e8507df4a211.tar.zst freebsd-ports-gnome-f95f63d11973679079a6b40742f9e8507df4a211.zip |
- Add staging support, allow it as regular user
- Convert to new options framework
- Turn 2 simple patches to REINPLACE_CMD
- Respect CC, CFLAGS during build
Diffstat (limited to 'security/ipfw2dshield')
-rw-r--r-- | security/ipfw2dshield/Makefile | 17 | ||||
-rw-r--r-- | security/ipfw2dshield/files/patch-Makefile | 12 | ||||
-rw-r--r-- | security/ipfw2dshield/files/patch-ipaddr_Makefile | 11 | ||||
-rw-r--r-- | security/ipfw2dshield/files/patch-strpdate_Makefile | 11 |
4 files changed, 16 insertions, 35 deletions
diff --git a/security/ipfw2dshield/Makefile b/security/ipfw2dshield/Makefile index 77fea8579c76..3a26597b33cc 100644 --- a/security/ipfw2dshield/Makefile +++ b/security/ipfw2dshield/Makefile @@ -6,21 +6,22 @@ PORTVERSION= 0.5 CATEGORIES= security MASTER_SITES= http://www.dynamical-systems.org/ipfw/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= DShield client for ipfw logs PORTDOCS= CHANGES README.html README.txt -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/ipfw2dshield + @${REINPLACE_CMD} -E -e '/^(CC|CFLAGS|prefix)/ s|=|?=|' \ + -e 's|bindir)|DESTDIR)$$(&|' \ + ${WRKSRC}/ipaddr/Makefile \ + ${WRKSRC}/strpdate/Makefile post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/security/ipfw2dshield/files/patch-Makefile b/security/ipfw2dshield/files/patch-Makefile index 0cfcba8f9a38..97070322aefe 100644 --- a/security/ipfw2dshield/files/patch-Makefile +++ b/security/ipfw2dshield/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat May 29 16:27:21 2004 -+++ Makefile Fri Jun 11 15:41:20 2004 +--- Makefile.orig 2004-05-29 16:27:21.000000000 +0200 ++++ Makefile 2014-07-11 00:00:21.463847887 +0200 @@ -4,7 +4,8 @@ RMCMD = rm -f INSTALL = install @@ -10,12 +10,14 @@ sbindir = $(prefix)/sbin SUBDIRS = ipaddr strpdate -@@ -29,12 +30,12 @@ +@@ -28,13 +29,13 @@ + install: $(RC) @for subdir in $(SUBDIRS); do (cd $$subdir && make install) ; done @[ -d $(sbindir) ] || mkdir -vp $(sbindir) - $(INSTALL) -c -m 700 -o root $(PROGRAM) $(sbindir) +- $(INSTALL) -c -m 700 -o root $(PROGRAM) $(sbindir) - $(INSTALL) -c -m 600 -o root $(RC) $(HOME)/.$(RC).sample -+ $(INSTALL) -c -m 600 -o root $(RC) $(etcdir)/$(RC).sample ++ $(INSTALL) -c -m 700 $(PROGRAM) $(DESTDIR)$(sbindir) ++ $(INSTALL) -c -m 600 $(RC) $(DESTDIR)$(etcdir)/$(RC).sample uninstall: @for subdir in $(SUBDIRS); do (cd $$subdir && make uninstall) ; done diff --git a/security/ipfw2dshield/files/patch-ipaddr_Makefile b/security/ipfw2dshield/files/patch-ipaddr_Makefile deleted file mode 100644 index 692462426805..000000000000 --- a/security/ipfw2dshield/files/patch-ipaddr_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ipaddr/Makefile.orig Fri Feb 15 12:39:34 2002 -+++ ipaddr/Makefile Sat Nov 27 03:40:11 2004 -@@ -27,7 +27,7 @@ - CC = cc - CFLAGS = -O2 -Wall - --prefix = /usr/local -+prefix = ${PREFIX} - bindir = $(prefix)/bin - - SRCS = ipaddr.c diff --git a/security/ipfw2dshield/files/patch-strpdate_Makefile b/security/ipfw2dshield/files/patch-strpdate_Makefile deleted file mode 100644 index f64dfdcbe6e5..000000000000 --- a/security/ipfw2dshield/files/patch-strpdate_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- strpdate/Makefile.orig Wed May 12 09:14:36 2004 -+++ strpdate/Makefile Sat Nov 27 03:40:53 2004 -@@ -27,7 +27,7 @@ - CC = cc - CFLAGS = -O2 -Wall - --prefix = /usr/local -+prefix = ${PREFIX} - bindir = $(prefix)/bin - - SRCS = strpdate.c |