From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 20 08:03:19 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3BEC277C;
 Fri, 20 Dec 2013 08:03:19 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E24218D6;
 Fri, 20 Dec 2013 08:03:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK83IIx047321;
 Fri, 20 Dec 2013 08:03:18 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK83Ilw047320;
 Fri, 20 Dec 2013 08:03:18 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312200803.rBK83Ilw047320@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 20 Dec 2013 08:03:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r336983 - in branches/2014Q1/security/fl0p: . files
X-SVN-Group: ports-branches
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 08:03:19 -0000

Author: bapt
Date: Fri Dec 20 08:03:18 2013
New Revision: 336983
URL: http://svnweb.freebsd.org/changeset/ports/336983

Log:
  MFH: r336951
  
  - Support CC/CFLAGS properly
  - Add LICENSE
  - Switch to PLIST_FILES
  - Support staging
  
  PR:		ports/184830
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  branches/2014Q1/security/fl0p/files/
  branches/2014Q1/security/fl0p/pkg-plist
Modified:
  branches/2014Q1/security/fl0p/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/fl0p/Makefile
==============================================================================
--- branches/2014Q1/security/fl0p/Makefile	Fri Dec 20 08:02:31 2013	(r336982)
+++ branches/2014Q1/security/fl0p/Makefile	Fri Dec 20 08:03:18 2013	(r336983)
@@ -11,22 +11,33 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Passive L7 flow fingerprinting tool
 
-WRKSRC=		${WRKDIR}/fl0p/
+LICENSE=	LGPL21
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+PORTDOCS=	ChangeLog CREDITS README TODO
+PLIST_FILES=	bin/fl0p %%DATADIR%%/fl0p.fp
+PLIST_DIRS=	%%DATADIR%%
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e \
+		's|"/etc/fl0p"|"${DATADIR}"|' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e \
+		's|^GMAKE_OK|#GMAKE_OK|' ${WRKSRC}/Build
+	@${REINPLACE_CMD} -e \
+		'/^CC/s|\([[:blank:]]\)=|\1?=| ; \
+		 /^CFLAGS/s|\([[:blank:]]\)=|\1+=| ; \
+		 s|-g -ggdb|| ; \
+		 s|-I.*|$$(CPPFLAGS)| ; \
+		 /^all:/s|strip||' ${WRKSRC}/mk/Linux
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fl0p ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/fl0p.fp ${DATADIR}/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/README ${DOCSDIR}/
-	${INSTALL_MAN} ${WRKSRC}/doc/ChangeLog ${DOCSDIR}/
-	${INSTALL_MAN} ${WRKSRC}/doc/TODO ${DOCSDIR}/
-	${INSTALL_MAN} ${WRKSRC}/doc/CREDITS ${DOCSDIR}/
-.endif
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} fl0p ${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} fl0p.fp ${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>