svn commit: r361496 - in head/security/ipfw2dshield: . files

[Pawel Pekala]

Author: pawel
Date: Thu Jul 10 22:14:30 2014
New Revision: 361496
URL: http://svnweb.freebsd.org/changeset/ports/361496
QAT: https://qat.redports.org/buildarchive/r361496/

Log:
  - 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

Deleted:
  head/security/ipfw2dshield/files/patch-ipaddr_Makefile
  head/security/ipfw2dshield/files/patch-strpdate_Makefile
Modified:
  head/security/ipfw2dshield/Makefile
  head/security/ipfw2dshield/files/patch-Makefile

Modified: head/security/ipfw2dshield/Makefile
==============================================================================
--- head/security/ipfw2dshield/Makefile	Thu Jul 10 22:09:46 2014	(r361495)
+++ head/security/ipfw2dshield/Makefile	Thu Jul 10 22:14:30 2014	(r361496)
@@ -6,21 +6,22 @@ PORTVERSION=	0.5
 CATEGORIES=	security
 MASTER_SITES=	http://www.dynamical-systems.org/ipfw/
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at 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>

Modified: head/security/ipfw2dshield/files/patch-Makefile
==============================================================================
--- head/security/ipfw2dshield/files/patch-Makefile	Thu Jul 10 22:09:46 2014	(r361495)
+++ head/security/ipfw2dshield/files/patch-Makefile	Thu Jul 10 22:14:30 2014	(r361496)
@@ -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