Date: Sun, 16 Jun 2019 18:42:05 +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: r504360 - in head/net-mgmt/pmacct: . files Message-ID: <201906161842.x5GIg5wW044153@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Jun 16 18:42:05 2019 New Revision: 504360 URL: https://svnweb.freebsd.org/changeset/ports/504360 Log: net-mgmt/pmacct: fix pkg-plist for the default case PR: 238464 Reported by: Michael Proto <mike@jellydonut.org> Added: head/net-mgmt/pmacct/files/patch-Makefile.am (contents, props changed) head/net-mgmt/pmacct/files/patch-Makefile.in (contents, props changed) Modified: head/net-mgmt/pmacct/Makefile head/net-mgmt/pmacct/pkg-plist Modified: head/net-mgmt/pmacct/Makefile ============================================================================== --- head/net-mgmt/pmacct/Makefile Sun Jun 16 17:55:50 2019 (r504359) +++ head/net-mgmt/pmacct/Makefile Sun Jun 16 18:42:05 2019 (r504360) @@ -43,9 +43,11 @@ SQLITE3_DESC= Enable SQLite3 support USES+= mysql CONFIGURE_ARGS+=--enable-mysql PLIST_SUB+= WITH_MYSQL="" +PLIST_SUB+= SQLDOC="" .else CONFIGURE_ARGS+=--disable-mysql PLIST_SUB+= WITH_MYSQL="@comment " +PLIST_SUB+= SQLDOC="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} @@ -53,9 +55,11 @@ USES+= pgsql WANT_PGSQL= client CONFIGURE_ARGS+=--enable-pgsql PLIST_SUB+= WITH_PGSQL="" +PLIST_SUB+= SQLDOC="" .else CONFIGURE_ARGS+=--disable-pgsql PLIST_SUB+= WITH_PGSQL="@comment " +PLIST_SUB+= SQLDOC="@comment " .endif .if ${PORT_OPTIONS:MSQLITE3} @@ -63,9 +67,11 @@ USES+= pkgconfig sqlite CONFIGURE_ARGS+=--enable-sqlite3 \ --with-sqlite3-includes=${LOCALBASE}/include PLIST_SUB+= WITH_SQLITE3="" +PLIST_SUB+= SQLDOC="" .else CONFIGURE_ARGS+=--disable-sqlite3 PLIST_SUB+= WITH_SQLITE3="@comment " +PLIST_SUB+= SQLDOC="@comment " .endif .if ${PORT_OPTIONS:MLAYER2} @@ -157,9 +163,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} .for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART UPGRADE ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} Added: head/net-mgmt/pmacct/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pmacct/files/patch-Makefile.am Sun Jun 16 18:42:05 2019 (r504360) @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2019-04-19 04:06:27.000000000 +0200 ++++ Makefile.am 2019-06-16 19:58:43.298406000 +0200 +@@ -17,7 +17,7 @@ + pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg + pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom + if USING_SQL +-pmacct_sql_dir = $(pmacct_data_dir)/sql ++pmacct_sql_dir = $(pmacct_data_dir) + endif + + pmacct_data__DATA = CONFIG-KEYS FAQS QUICKSTART UPGRADE Added: head/net-mgmt/pmacct/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pmacct/files/patch-Makefile.in Sun Jun 16 18:42:05 2019 (r504360) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2019-06-16 20:01:08.854403000 +0200 ++++ Makefile.in 2019-06-16 20:01:32.038160000 +0200 +@@ -346,7 +346,7 @@ + pmacct_examples_lg_dir = $(pmacct_examples_dir)/lg + pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg + pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom +-@USING_SQL_TRUE@pmacct_sql_dir = $(pmacct_data_dir)/sql ++@USING_SQL_TRUE@pmacct_sql_dir = $(pmacct_data_dir) + pmacct_data__DATA = CONFIG-KEYS FAQS QUICKSTART UPGRADE + pmacct_docs__DATA = docs/IPFIX docs/LOOKING_GLASS_FORMAT docs/SIGNALS \ + docs/MSGLOG_DUMP_FORMATS docs/TRIGGER_VARS Modified: head/net-mgmt/pmacct/pkg-plist ============================================================================== --- head/net-mgmt/pmacct/pkg-plist Sun Jun 16 17:55:50 2019 (r504359) +++ head/net-mgmt/pmacct/pkg-plist Sun Jun 16 18:42:05 2019 (r504360) @@ -76,25 +76,25 @@ sbin/sfacctd %%DATADIR%%/CONFIG-KEYS %%DATADIR%%/FAQS %%DATADIR%%/QUICKSTART -%%DATADIR%%/sql/README.64bit -%%DATADIR%%/sql/README.GeoIP -%%DATADIR%%/sql/README.IPv6 -%%DATADIR%%/sql/README.cos -%%DATADIR%%/sql/README.custom_primitives -%%DATADIR%%/sql/README.etype -%%DATADIR%%/sql/README.export_proto -%%DATADIR%%/sql/README.iface -%%DATADIR%%/sql/README.label -%%DATADIR%%/sql/README.mask -%%DATADIR%%/sql/README.mpls -%%DATADIR%%/sql/README.mysql -%%DATADIR%%/sql/README.nat -%%DATADIR%%/sql/README.pgsql -%%DATADIR%%/sql/README.sampling -%%DATADIR%%/sql/README.sqlite3 -%%DATADIR%%/sql/README.tag2 -%%DATADIR%%/sql/README.timestamp -%%DATADIR%%/sql/README.tunnel +%%SQLDOC%%%%DATADIR%%/README.64bit +%%SQLDOC%%%%DATADIR%%/README.GeoIP +%%SQLDOC%%%%DATADIR%%/README.IPv6 +%%SQLDOC%%%%DATADIR%%/README.cos +%%SQLDOC%%%%DATADIR%%/README.custom_primitives +%%SQLDOC%%%%DATADIR%%/README.etype +%%SQLDOC%%%%DATADIR%%/README.export_proto +%%SQLDOC%%%%DATADIR%%/README.iface +%%SQLDOC%%%%DATADIR%%/README.label +%%SQLDOC%%%%DATADIR%%/README.mask +%%SQLDOC%%%%DATADIR%%/README.mpls +%%SQLDOC%%%%DATADIR%%/README.mysql +%%SQLDOC%%%%DATADIR%%/README.nat +%%SQLDOC%%%%DATADIR%%/README.pgsql +%%SQLDOC%%%%DATADIR%%/README.sampling +%%SQLDOC%%%%DATADIR%%/README.sqlite3 +%%SQLDOC%%%%DATADIR%%/README.tag2 +%%SQLDOC%%%%DATADIR%%/README.timestamp +%%SQLDOC%%%%DATADIR%%/README.tunnel %%DATADIR%%/UPGRADE %%DATADIR%%/docs/IPFIX %%DATADIR%%/docs/LOOKING_GLASS_FORMAT @@ -125,36 +125,36 @@ sbin/sfacctd %%DATADIR%%/examples/probe_sflow.conf.example %%DATADIR%%/examples/sampling.map.example %%DATADIR%%/examples/tee_receivers.lst.example -%%DATADIR%%/sql/pmacct-create-db.pgsql -%%DATADIR%%/sql/pmacct-create-db_bgp_v1.mysql -%%DATADIR%%/sql/pmacct-create-db_v1.mysql -%%DATADIR%%/sql/pmacct-create-db_v2.mysql -%%DATADIR%%/sql/pmacct-create-db_v3.mysql -%%DATADIR%%/sql/pmacct-create-db_v4.mysql -%%DATADIR%%/sql/pmacct-create-db_v5.mysql -%%DATADIR%%/sql/pmacct-create-db_v6.mysql -%%DATADIR%%/sql/pmacct-create-db_v7.mysql -%%DATADIR%%/sql/pmacct-create-db_v8.mysql -%%DATADIR%%/sql/pmacct-create-db_v9.mysql -%%DATADIR%%/sql/pmacct-create-table_bgp_v1.pgsql -%%DATADIR%%/sql/pmacct-create-table_bgp_v1.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v1.pgsql -%%DATADIR%%/sql/pmacct-create-table_v1.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v2.pgsql -%%DATADIR%%/sql/pmacct-create-table_v2.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v3.pgsql -%%DATADIR%%/sql/pmacct-create-table_v3.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v4.pgsql -%%DATADIR%%/sql/pmacct-create-table_v4.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v5.pgsql -%%DATADIR%%/sql/pmacct-create-table_v5.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v6.pgsql -%%DATADIR%%/sql/pmacct-create-table_v6.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v7.pgsql -%%DATADIR%%/sql/pmacct-create-table_v7.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v8.sqlite3 -%%DATADIR%%/sql/pmacct-create-table_v9.pgsql -%%DATADIR%%/sql/pmacct-create-table_v9.sqlite3 -%%DATADIR%%/sql/pmacct-grant-db.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_bgp_v1.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v1.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v2.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v3.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v4.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v5.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v6.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v7.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v8.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-db_v9.mysql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v1.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v1.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v2.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v2.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v3.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v3.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v4.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v4.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v5.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v5.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v6.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v6.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v7.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v7.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v8.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v9.pgsql +%%SQLDOC%%%%DATADIR%%/pmacct-create-table_v9.sqlite3 +%%SQLDOC%%%%DATADIR%%/pmacct-grant-db.mysql @dir lib/pmacct/examples/custom %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/lg/.libs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906161842.x5GIg5wW044153>