Date: Wed, 9 Jul 2014 11:13:30 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361352 - in head/net-mgmt/flow-tools-ng: . files Message-ID: <201407091113.s69BDUT2038950@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Jul 9 11:13:29 2014 New Revision: 361352 URL: http://svnweb.freebsd.org/changeset/ports/361352 QAT: https://qat.redports.org/buildarchive/r361352/ Log: - Add USES=libtool - Add INSTALL_TARGET=install-strip - Replace pkg-install and pkg-deinstall with USERS, GROUPS and pkg-plist commands - Use ETCDIR Deleted: head/net-mgmt/flow-tools-ng/files/pkg-deinstall.in head/net-mgmt/flow-tools-ng/files/pkg-install.in Modified: head/net-mgmt/flow-tools-ng/Makefile head/net-mgmt/flow-tools-ng/pkg-plist Modified: head/net-mgmt/flow-tools-ng/Makefile ============================================================================== --- head/net-mgmt/flow-tools-ng/Makefile Wed Jul 9 11:09:00 2014 (r361351) +++ head/net-mgmt/flow-tools-ng/Makefile Wed Jul 9 11:13:29 2014 (r361352) @@ -3,6 +3,7 @@ PORTNAME= flow-tools PORTVERSION= 0.68.5.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMESUFFIX= -ng @@ -25,39 +26,34 @@ OPENSSL_USE= OPENSSL=yes CONFLICTS= flow-tools-[0-9]* -USES= gmake tar:bzip2 +USES= gmake libtool tar:bzip2 +USE_LDCONFIG= yes USE_PYTHON_RUN= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--localstatedir="${PREFIX}" -USE_LDCONFIG= Yes +INSTALL_TARGET= install-strip -SUB_FILES= pkg-install pkg-deinstall +PLIST_SUB= RESETPREFIX=${PREFIX} SUB_LIST= FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \ - FLOW_CAPTURE_USER="${FLOW_CAPTURE_USER}" \ - FLOW_CAPTURE_GROUP="${FLOW_CAPTURE_GROUP}" \ - FLOW_CAPTURE_UID="${FLOW_CAPTURE_UID}" \ - FLOW_CAPTURE_GID="${FLOW_CAPTURE_GID}" \ FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}" USE_RC_SUBR= flow_capture flow_fanout -VARDIR?= /var -FLOW_CAPTURE_SPOOL= ${VARDIR}/db/flows -FLOW_CAPTURE_USER= flowtools -FLOW_CAPTURE_GROUP= flowtools -FLOW_CAPTURE_UID= 174 -FLOW_CAPTURE_GID= 174 -FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-capture +FLOW_CAPTURE_SPOOL= /var/db/flows +FLOW_CAPTURE_PIDDIR= /var/run/flow-capture + +USERS= flowtools +GROUPS= flowtools post-patch: @${REINPLACE_CMD}\ - -e 's|@sysconfdir@/sym/|${PREFIX}/share/flow-tools/|' \ - -e 's|@sysconfdir@/cfg/|${PREFIX}/etc/flow-tools/|' \ + -e 's|@sysconfdir@/sym/|${ETCDIR}/|' \ + -e 's|@sysconfdir@/cfg/|${ETCDIR}/|' \ ${WRKSRC}/docs/flow-*.1.in ${WRKSRC}/docs/flow-*.html.in @${REINPLACE_CMD} -e 's|!/bin/env|!/usr/bin/env|' \ ${WRKSRC}/bin/* ${WRKSRC}/utils/* post-install: + ${MKDIR} ${STAGEDIR}${FLOW_CAPTURE_SPOOL} + ${MKDIR} ${STAGEDIR}${FLOW_CAPTURE_PIDDIR} ${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libft.so.0 .include <bsd.port.mk> Modified: head/net-mgmt/flow-tools-ng/pkg-plist ============================================================================== --- head/net-mgmt/flow-tools-ng/pkg-plist Wed Jul 9 11:09:00 2014 (r361351) +++ head/net-mgmt/flow-tools-ng/pkg-plist Wed Jul 9 11:13:29 2014 (r361352) @@ -22,23 +22,23 @@ bin/flow-split bin/flow-stat bin/flow-tag bin/flow-xlate -etc/flow-tools/asn.sym -etc/flow-tools/filter.cfg -etc/flow-tools/ip-prot.sym -etc/flow-tools/ip-type.sym -etc/flow-tools/map.cfg -etc/flow-tools/mask.cfg -etc/flow-tools/stat.cfg -etc/flow-tools/tag.cfg -etc/flow-tools/tag.sym -etc/flow-tools/tcp-port.sym -etc/flow-tools/xlate.cfg +%%ETCDIR%%/asn.sym +%%ETCDIR%%/filter.cfg +%%ETCDIR%%/ip-prot.sym +%%ETCDIR%%/ip-type.sym +%%ETCDIR%%/map.cfg +%%ETCDIR%%/mask.cfg +%%ETCDIR%%/stat.cfg +%%ETCDIR%%/tag.cfg +%%ETCDIR%%/tag.sym +%%ETCDIR%%/tcp-port.sym +%%ETCDIR%%/xlate.cfg include/ftlib.h include/ftqueue.h lib/libft.a -lib/libft.la lib/libft.so lib/libft.so.0 +lib/libft.so.0.0.0 man/man1/flow-capture.1.gz man/man1/flow-cat.1.gz man/man1/flow-dscan.1.gz @@ -70,4 +70,17 @@ man/man1/flow-rpt2rrd.1.gz %%DATADIR%%/gprot %%DATADIR%%/gserv @dirrmtry %%DATADIR%% -@dirrmtry etc/flow-tools +@dirrmtry %%ETCDIR%% +@cwd /var +@exec install -d -o flowtools -g flowtools -m 1700 %D/db/flows +@exec install -d -o flowtools -g flowtools -m 700 %D/run/flow-capture +@owner flowtools +@group flowtools +@mode 700 +@dirrmtry run/flow-capture +@mode 1700 +@dirrmtry db/flows +@owner +@group +@mode +@cwd %%RESETPREFIX%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407091113.s69BDUT2038950>