CVS commit: pkgsrc/sysutils/facette

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Feb 14 21:24:04 UTC 2017

Modified Files:
        pkgsrc/sysutils/facette: Makefile distinfo
        pkgsrc/sysutils/facette/patches: patch-Makefile

Log Message:
Fix Go invocation. Mark as BROKEN because it tries to fetch things from
the net during build.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/facette/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/facette/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/facette/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/facette/Makefile
diff -u pkgsrc/sysutils/facette/Makefile:1.12 pkgsrc/sysutils/facette/Makefile:1.13
--- pkgsrc/sysutils/facette/Makefile:1.12       Sun Feb 12 06:25:59 2017
+++ pkgsrc/sysutils/facette/Makefile    Tue Feb 14 21:24:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/02/12 06:25:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2017/02/14 21:24:04 joerg Exp $
 
 DISTNAME=      facette-0.4.0dev
 PKGREVISION=   12
@@ -15,6 +15,8 @@ GITHUB_TAG=   d77e77680d52d232305d0f12af6e
 
 EXTRACT_USING= bsdtar
 
+BROKEN=                Tries to install uglify-js during build.
+
 USE_TOOLS+=    bsdtar gmake gsed pax pkg-config
 BUILD_DEPENDS+=        go-[0-9]*:../../lang/go
 BUILD_DEPENDS+=        nodejs-[0-9]*:../../lang/nodejs

Index: pkgsrc/sysutils/facette/distinfo
diff -u pkgsrc/sysutils/facette/distinfo:1.1 pkgsrc/sysutils/facette/distinfo:1.2
--- pkgsrc/sysutils/facette/distinfo:1.1        Tue Mar  8 16:52:44 2016
+++ pkgsrc/sysutils/facette/distinfo    Tue Feb 14 21:24:04 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/03/08 16:52:44 imil Exp $
+$NetBSD: distinfo,v 1.2 2017/02/14 21:24:04 joerg Exp $
 
 SHA1 (facette-0.4.0dev-d77e77680d52d232305d0f12af6e3e1c857903cb.tar.gz) = d0025f1b4612b5c6230793fa962dd9d9cc753b72
 RMD160 (facette-0.4.0dev-d77e77680d52d232305d0f12af6e3e1c857903cb.tar.gz) = 94821f0b05c8381f12140827827e23faf9277608
 SHA512 (facette-0.4.0dev-d77e77680d52d232305d0f12af6e3e1c857903cb.tar.gz) = 
6739f0c2b599b4297b9dec12c0a288f4f1b0a9e6aed8774a2b8daa82cfbe5f577d3e4c5bb247a2853a1775ba6a5f7502e5b03f1e77aab85a46b6da82dff0852c
 Size (facette-0.4.0dev-d77e77680d52d232305d0f12af6e3e1c857903cb.tar.gz) = 3580148 bytes
-SHA1 (patch-Makefile) = 7f91867729aa60c7329138af846239cc61f3898c
+SHA1 (patch-Makefile) = f7aca35d5f03fe877ee88079fe6cca372b4b01a1

Index: pkgsrc/sysutils/facette/patches/patch-Makefile
diff -u pkgsrc/sysutils/facette/patches/patch-Makefile:1.1 pkgsrc/sysutils/facette/patches/patch-Makefile:1.2
--- pkgsrc/sysutils/facette/patches/patch-Makefile:1.1  Tue Mar  8 16:52:44 2016
+++ pkgsrc/sysutils/facette/patches/patch-Makefile      Tue Feb 14 21:24:04 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2016/03/08 16:52:44 imil Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/02/14 21:24:04 joerg Exp $
 
 Make facette Makefile NetBSD-friendly.
 
@@ -8,7 +8,7 @@ Make facette Makefile NetBSD-friendly.
 
 --- Makefile.orig      2015-12-22 05:00:11.000000000 +0000
 +++ Makefile
-@@ -16,6 +16,13 @@ UNAME := $(shell uname -s)
+@@ -16,6 +16,13 @@ TAGS ?= facette \
  
  GO ?= go
  
@@ -36,6 +36,21 @@ Make facette Makefile NetBSD-friendly.
  
  .PHONY: install
  install: install-bin install-doc install-static
+@@ -118,10 +130,10 @@ $(BIN_OUTPUT): $(PKG_SRC) $(BIN_SRC) $(B
+       @$(call mesg_start,$(notdir $@),Building $(notdir $@)...)
+       @install -d -m 0755 $(dir $@) && $(GO) build \
+                       -ldflags " \
+-                              -X main.version $(VERSION) \
+-                              -X main.buildDate '$(BUILD_DATE)' \
+-                              $(PKG_LIST:%=-X github.com/facette/facette/%.version $(VERSION)) \
+-                              $(PKG_LIST:%=-X github.com/facette/facette/%.buildDate '$(BUILD_DATE)') \
++                              -X main.version=$(VERSION) \
++                              -X main.buildDate='$(BUILD_DATE)' \
++                              $(PKG_LIST:%=-X github.com/facette/facette/%.version=$(VERSION)) \
++                              $(PKG_LIST:%=-X github.com/facette/facette/%.buildDate='$(BUILD_DATE)') \
+                       " \
+                       -tags "$(TAGS)" \
+                       -o $@ cmd/$(notdir $@)/*.go && \
 @@ -277,7 +289,7 @@ $(SCRIPT_EXTRA_OUTPUT): $(SCRIPT_EXTRA)
  $(MESG_OUTPUT): $(MESG_SRC)
        @$(call mesg_start,static,Packing $(MESG_SRC) file...)