Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Feb 2017 20:02:40 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r435082 - head/net-mgmt/nfdump
Message-ID:  <201702282002.v1SK2eYh015694@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Tue Feb 28 20:02:40 2017
New Revision: 435082
URL: https://svnweb.freebsd.org/changeset/ports/435082

Log:
  net-mgmt/nfdump: fix installation
  
  - install real binaries and library, not libtool scripts
  
  PR:		217400
  Submitted by:	Trond.Endrestol@ximalas.info

Modified:
  head/net-mgmt/nfdump/Makefile

Modified: head/net-mgmt/nfdump/Makefile
==============================================================================
--- head/net-mgmt/nfdump/Makefile	Tue Feb 28 19:53:12 2017	(r435081)
+++ head/net-mgmt/nfdump/Makefile	Tue Feb 28 20:02:40 2017	(r435082)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nfdump
 PORTVERSION=	1.6.15
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
@@ -54,6 +55,7 @@ CONFIGURE_ARGS+=	--disable-nsel
 .endif
 
 PLIST_FILES=	bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \
+		lib/libnfdump-${PORTVERSION}.so \
 		man/man1/nfanon.1.gz man/man1/nfcapd.1.gz man/man1/nfdump.1.gz \
 		man/man1/nfexpire.1.gz man/man1/nfreplay.1.gz
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README
@@ -107,30 +109,26 @@ CONFIGURE_ARGS+=	--disable-sflow
 
 do-install:
 .for binary in nfanon nfcapd nfdump nfexpire nfreplay
-	${INSTALL_DATA} ${WRKSRC}/bin/${binary} ${STAGEDIR}${PREFIX}/bin
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${binary}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/${binary} ${STAGEDIR}${PREFIX}/bin
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/bin/.libs/libnfdump-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib
 
 .if ${PORT_OPTIONS:MNFPROFILE}
-	${INSTALL_DATA}	${WRKSRC}/bin/nfprofile	${STAGEDIR}${PREFIX}/bin
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/nfprofile
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfprofile ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN}	${WRKSRC}/man/nfprofile.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
 
 .if ${PORT_OPTIONS:MNFTRACK}
-	${INSTALL_DATA}	${WRKSRC}/bin/nftrack	${STAGEDIR}${PREFIX}/bin
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/nftrack
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nftrack ${STAGEDIR}${PREFIX}/bin
 .endif
 
 .if ${PORT_OPTIONS:MFT2NFDUMP}
-	${INSTALL_DATA}	${WRKSRC}/bin/ft2nfdump	${STAGEDIR}${PREFIX}/bin
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/ft2nfdump
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/ft2nfdump ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN}	${WRKSRC}/man/ft2nfdump.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
 
 .if ${PORT_OPTIONS:MSFLOW}
-	${INSTALL_DATA}	${WRKSRC}/bin/sfcapd	${STAGEDIR}${PREFIX}/bin
-	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/sfcapd
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sfcapd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN}	${WRKSRC}/man/sfcapd.1	${STAGEDIR}${PREFIX}/man/man1
 .endif
 



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