From owner-svn-ports-all@FreeBSD.ORG Thu Jul 10 22:14:31 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A61A1942; Thu, 10 Jul 2014 22:14:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79C8C2B68; Thu, 10 Jul 2014 22:14:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AMEVVj047534; Thu, 10 Jul 2014 22:14:31 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AMEVjo047532; Thu, 10 Jul 2014 22:14:31 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407102214.s6AMEVjo047532@svn.freebsd.org> From: Pawel Pekala Date: Thu, 10 Jul 2014 22:14:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361496 - in head/security/ipfw2dshield: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 22:14:31 -0000 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@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 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