Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Dec 2013 08:03:18 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
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
Message-ID:  <201312200803.rBK83Ilw047320@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312200803.rBK83Ilw047320>