Unfortunately, there was an error in go.port.mk.  Corrected patch
follows.  FWIW everything is available in openbsd-wip.

-- 
Dmitrij D. Czarkoff

Index: lang/go/go.port.mk
===================================================================
RCS file: /var/cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.1
diff -u -p -r1.1 go.port.mk
--- lang/go/go.port.mk  15 May 2015 07:30:41 -0000      1.1
+++ lang/go/go.port.mk  4 Jun 2015 09:42:45 -0000
@@ -11,8 +11,68 @@ MODGO_BUILD_DEPENDS =        lang/go
 BUILD_DEPENDS +=       ${MODGO_BUILD_DEPENDS}
 .endif
 
-GO_PKG ?=              pkg/tool/openbsd_${MACHINE_ARCH:S/i386/386/}
+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/}
 
-SUBST_VARS +=          GO_PKG
+SUBST_VARS +=          MODGO_TOOLS MODGO_PACKAGES MODGO_SOURCES
 
-GOPATH ?=              "${WRKSRC}:${LOCALBASE}/go"
+MODGO_SUBDIR ?=                ${WRKDIST}
+MODGO_TYPE ?=          bin
+MODGO_WORKSPACE ?=     ${WRKDIR}/go
+MODGO_CMD ?=           GOPATH="${MODGO_WORKSPACE}" WORK="${WRKBUILD}" go
+MODGO_FLAGS +=         -x -work
+MODGO_BUILD_CMD =      ${MODGO_CMD} install ${MODGO_FLAGS}
+MODGO_TEST_CMD =       ${MODGO_CMD} test ${MODGO_FLAGS}
+
+.if ${MODGO_TYPE:L:Mlib}
+RUN_DEPENDS +=         ${MODGO_RUN_DEPENDS}
+.endif
+
+.if defined(GH_ACCOUNT) && defined(GH_PROJECT)
+ALL_TARGET ?=          github.com/${GH_ACCOUNT}/${GH_PROJECT}
+.endif
+TEST_TARGET ?=         ${ALL_TARGET}
+
+SEPARATE_BUILD ?=      Yes
+WRKSRC ?=              ${MODGO_WORKSPACE}/src/${ALL_TARGET}
+
+MODGO_SETUP_WORKSPACE =        mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR} 
${WRKSRC};
+
+MODGO_BUILD_TARGET =   ${MODGO_BUILD_CMD} ${ALL_TARGET}
+
+# Go source files serve the purpose of libraries, so sources should be included
+# with library ports
+.if ${MODGO_TYPE:L:Mlib}
+MODGO_INSTALL_TARGET = ${INSTALL_DATA_DIR} ${PREFIX}/go; \
+                       cp -R ${MODGO_WORKSPACE}/pkg \
+                             ${MODGO_WORKSPACE}/src \
+                                       ${PREFIX}/go;
+.endif
+.if ${MODGO_TYPE:L:Mbin}
+MODGO_INSTALL_TARGET += cp ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin
+.endif
+
+MODGO_TEST_TARGET =    ${MODGO_TEST_CMD} ${TEST_TARGET}
+
+.if empty(CONFIGURE_STYLE)
+.  if !target(post-patch)
+post-patch:
+       ${MODGO_SETUP_WORKSPACE}
+.  endif
+
+.  if !target(do-build)
+do-build:
+       ${MODGO_BUILD_TARGET}
+.  endif
+
+.  if !target(do-install)
+do-install:
+       ${MODGO_INSTALL_TARGET}
+.  endif
+
+.  if !target(do-test)
+do-test:
+       ${MODGO_TEST_TARGET}
+.  endif
+.endif

Reply via email to