On Wednesday 09 December 2015 00:40:28 Joel Sing wrote:
> I'll rework go.port.mk and the relevant packages using /usr/local/go-pkg.
This reworks go.port.mk to install packages in /usr/local/go-pkg and builds
without -a, -work and without running things through sed and piping to shell.
The net/websocketd and textproc/go-xlsx should now be fixed (along with
their dependencies) - I still need to take a closer look at the other two...
Comments or oks?
Index: lang/go/go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.4
diff -u -p -r1.4 go.port.mk
--- lang/go/go.port.mk 11 Aug 2015 20:16:21 -0000 1.4
+++ lang/go/go.port.mk 22 Dec 2015 15:56:03 -0000
@@ -11,16 +11,17 @@ MODGO_BUILD_DEPENDS = lang/go
BUILD_DEPENDS += ${MODGO_BUILD_DEPENDS}
.endif
-MODGO_PACKAGES = go/pkg/openbsd_${MACHINE_ARCH:S/i386/386/}
-MODGO_SOURCES = go/src
-MODGO_TOOLS = go/pkg/tool/openbsd_${MACHINE_ARCH:S/i386/386/}
+MODGO_PACKAGE_PATH = ${PREFIX}/go-pkg
+MODGO_PACKAGES = go-pkg/pkg/openbsd_${MACHINE_ARCH:S/i386/386/}
+MODGO_SOURCES = go-pkg/src
+MODGO_TOOLS = go-pkg/tool/openbsd_${MACHINE_ARCH:S/i386/386/}
SUBST_VARS += MODGO_TOOLS MODGO_PACKAGES MODGO_SOURCES
MODGO_SUBDIR ?= ${WRKDIST}
MODGO_TYPE ?= bin
MODGO_WORKSPACE ?= ${WRKDIR}/go
-MODGO_CMD ?= unset GOPATH; export GOPATH="${MODGO_WORKSPACE}"; go
+MODGO_CMD ?= unset GOPATH; export
GOPATH="${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}"; go
MODGO_BUILD_CMD = ${MODGO_CMD} install ${MODGO_FLAGS}
MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS}
@@ -36,29 +37,20 @@ MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSR
CATEGORIES += lang/go
-# Go tends to ignore environment and place some files to system-wide
-# directories. To prevent such behavior, this modules fixes paths in
-# auto-generated build instructions, and then feeds fixed script to shell
-# The "operation not permitted" filter is needed because Go outputs permission
-# error if USE_SYSTRACE=Yes option is set.
-MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET} 2>&1 | sed -E \
- -e 's, ${LOCALBASE}/go, ${MODGO_WORKSPACE},' \
- -e '/operation not permitted/d' \
- -e 's,\$$WORK,${WRKBUILD},g' | sh -v
+MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET}
+MODGO_FLAGS ?= -x
.if ${MODGO_TYPE:L:Mbin}
-MODGO_FLAGS ?= -x -work
-MODGO_INSTALL_TARGET += cp ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin
+MODGO_INSTALL_TARGET = cp ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin
.endif
# Go source files serve the purpose of libraries, so sources should be included
# with library ports.
.if ${MODGO_TYPE:L:Mlib}
-MODGO_FLAGS ?= -a -x -work
-MODGO_INSTALL_TARGET = ${INSTALL_DATA_DIR} ${PREFIX}/go; \
+MODGO_INSTALL_TARGET = ${INSTALL_DATA_DIR} ${MODGO_PACKAGE_PATH}; \
cp -R ${MODGO_WORKSPACE}/pkg \
- ${MODGO_WORKSPACE}/src \
- ${PREFIX}/go;
+ ${MODGO_WORKSPACE}/src \
+ ${MODGO_PACKAGE_PATH};
.endif
MODGO_TEST_TARGET = ${MODGO_TEST_CMD} ${TEST_TARGET}
Index: net/go-websocket/Makefile
===================================================================
RCS file: /cvs/ports/net/go-websocket/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- net/go-websocket/Makefile 27 Jul 2015 21:06:22 -0000 1.5
+++ net/go-websocket/Makefile 22 Dec 2015 15:56:03 -0000
@@ -3,6 +3,7 @@
COMMENT = golang websocket package
VERSION = 0.1
+REVISION = 0
DISTNAME = go-websocket-${VERSION}
GH_COMMIT = 446d52dd4018303a13b36097e26d0888aca5d6ef
GH_ACCOUNT = golang
Index: net/go-websocket/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/go-websocket/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- net/go-websocket/pkg/PLIST 8 Jun 2015 09:17:04 -0000 1.2
+++ net/go-websocket/pkg/PLIST 22 Dec 2015 15:56:03 -0000
@@ -1,8 +1,12 @@
@comment $OpenBSD: PLIST,v 1.2 2015/06/08 09:17:04 czarkoff Exp $
+go-pkg/
+go-pkg/pkg/
+${MODGO_PACKAGES}/
${MODGO_PACKAGES}/golang.org/
${MODGO_PACKAGES}/golang.org/x/
${MODGO_PACKAGES}/golang.org/x/net/
${MODGO_PACKAGES}/golang.org/x/net/websocket.a
+${MODGO_SOURCES}/
${MODGO_SOURCES}/golang.org/
${MODGO_SOURCES}/golang.org/x/
${MODGO_SOURCES}/golang.org/x/net/
Index: textproc/go-xlsx/Makefile
===================================================================
RCS file: /cvs/ports/textproc/go-xlsx/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- textproc/go-xlsx/Makefile 18 Oct 2015 14:58:55 -0000 1.3
+++ textproc/go-xlsx/Makefile 22 Dec 2015 15:56:03 -0000
@@ -2,6 +2,7 @@
PORTROACH = ignore
+REVISION = 0
COMMENT = library for reading and writing XLSX files
DISTNAME = go-xlsx-20151010
CATEGORIES = textproc converters
Index: textproc/go-xlsx/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/go-xlsx/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- textproc/go-xlsx/pkg/PLIST 19 Jun 2015 08:48:00 -0000 1.1.1.1
+++ textproc/go-xlsx/pkg/PLIST 22 Dec 2015 15:56:03 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/19 08:48:00 czarkoff Exp $
+go-pkg/
+go-pkg/pkg/
${MODGO_PACKAGES}/
${MODGO_PACKAGES}/github.com/
${MODGO_PACKAGES}/github.com/tealeg/
@@ -21,6 +23,7 @@ ${MODGO_SOURCES}/github.com/tealeg/xlsx/
${MODGO_SOURCES}/github.com/tealeg/xlsx/doc.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/file.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/file_test.go
+${MODGO_SOURCES}/github.com/tealeg/xlsx/fuzzy_test.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/hsl.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/lib.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/lib_test.go
@@ -34,11 +37,14 @@ ${MODGO_SOURCES}/github.com/tealeg/xlsx/
${MODGO_SOURCES}/github.com/tealeg/xlsx/style_test.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/templates.go
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/
+${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/badfile_noWorkbookRels.xlsx
+${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/badfile_noWorksheets.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/empty_rows.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/googleDocsTest.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/macExcelTest.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/macNumbersTest.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/noStylesAndSharedStringsTest.xlsx
+${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/original.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/testcelltypes.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/testchartsheet.xlsx
${MODGO_SOURCES}/github.com/tealeg/xlsx/testdocs/testfile.xlsx
