svn commit: r507751 - in head: Mk/Uses databases/go-carbon security/ct-submit

[Tobias Kortkamp]

Author: tobik
Date: Thu Aug  1 06:25:44 2019
New Revision: 507751
URL: https://svnweb.freebsd.org/changeset/ports/507751

Log:
  Mk/Uses/go.mk: Drop PLIST_SUB for GO_PKGNAME
  
  GO_PKGNAME defaults to ${PORTNAME}.  As a result it is often too
  general and can produce bad results with make makeplist.  For
  example, in mail/aerc it produces bogus entries like
  
  man/man5/%%GO_PKGNAME%%-sendmail.5.gz
  
  since GO_PKGNAME=aerc there.
  
  Having it in PLIST_SUB was only useful for Go libraries which we
  no longer support.  Only 2 ports use it currently but do not really
  need to and are easily fixed.
  
  Approved by:	dg at syrec.org (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D21114

Deleted:
  head/security/ct-submit/pkg-plist
Modified:
  head/Mk/Uses/go.mk
  head/databases/go-carbon/pkg-plist
  head/security/ct-submit/Makefile

Modified: head/Mk/Uses/go.mk
==============================================================================
--- head/Mk/Uses/go.mk	Thu Aug  1 05:15:52 2019	(r507750)
+++ head/Mk/Uses/go.mk	Thu Aug  1 06:25:44 2019	(r507751)
@@ -100,7 +100,6 @@ BUILD_DEPENDS+=	${GO_CMD}:${GO_PORT}
 .if ${go_ARGS:Mrun}
 RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
 .endif
-PLIST_SUB+=	GO_PKGNAME=${GO_PKGNAME}
 
 _USES_POST+=	go
 .endif # !defined(_INCLUDE_USES_GO_MK)

Modified: head/databases/go-carbon/pkg-plist
==============================================================================
--- head/databases/go-carbon/pkg-plist	Thu Aug  1 05:15:52 2019	(r507750)
+++ head/databases/go-carbon/pkg-plist	Thu Aug  1 06:25:44 2019	(r507751)
@@ -1,6 +1,6 @@
-bin/%%GO_PKGNAME%%
- at sample %%ETCDIR%%/%%GO_PKGNAME%%.conf.sample
+bin/go-carbon
+ at sample %%ETCDIR%%/go-carbon.conf.sample
 @sample %%ETCDIR%%/storage-aggregation.conf.sample
 @sample %%ETCDIR%%/storage-schemas.conf.sample
- at dir(carbon,carbon,0750) /var/db/%%GO_PKGNAME%%
- at dir(carbon,carbon,0750) /var/log/%%GO_PKGNAME%%
+ at dir(carbon,carbon,0750) /var/db/go-carbon
+ at dir(carbon,carbon,0750) /var/log/go-carbon

Modified: head/security/ct-submit/Makefile
==============================================================================
--- head/security/ct-submit/Makefile	Thu Aug  1 05:15:52 2019	(r507750)
+++ head/security/ct-submit/Makefile	Thu Aug  1 06:25:44 2019	(r507751)
@@ -18,4 +18,6 @@ GH_ACCOUNT= grahamedgecombe
 GH_PROJECT= ct-submit
 GH_TAGNAME= 7bb2541
 
+PLIST_FILES=	bin/ct-submit
+
 .include <bsd.port.mk>