diff options
| author | dmgk <dmgk@FreeBSD.org> | 2019-09-30 06:34:31 +0800 |
|---|---|---|
| committer | dmgk <dmgk@FreeBSD.org> | 2019-09-30 06:34:31 +0800 |
| commit | b3b9468017934aa2bfc750dfb33cfebd805d4c89 (patch) | |
| tree | 8b41993e1df35d7245f4013a2d3adcb758a276a1 /x11 | |
| parent | b5fa25d93147965f8c5e5b9ca1d5fb93edf4e768 (diff) | |
| download | freebsd-ports-gnome-b3b9468017934aa2bfc750dfb33cfebd805d4c89.tar.gz freebsd-ports-gnome-b3b9468017934aa2bfc750dfb33cfebd805d4c89.tar.zst freebsd-ports-gnome-b3b9468017934aa2bfc750dfb33cfebd805d4c89.zip | |
Go ports: cleanup, finish transition to USES=go started with r505321 (cat. sysutils-x11)
- Remove custom build/install targets left in place after r505321
- Switch to the new GO_TARGET tuple syntax introduced in r512001
Reviewed by: tobik
Approved by: araujo (mentor), portmgr (adamw)
Differential Revision: https://reviews.freebsd.org/D21744
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/aminal/Makefile | 23 | ||||
| -rw-r--r-- | x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go (renamed from x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go) | 4 |
2 files changed, 9 insertions, 18 deletions
diff --git a/x11/aminal/Makefile b/x11/aminal/Makefile index 9f7353819766..a70175bc33d0 100644 --- a/x11/aminal/Makefile +++ b/x11/aminal/Makefile @@ -9,34 +9,25 @@ MAINTAINER= yuri@FreeBSD.org COMMENT= Golang terminal emulator from scratch LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gl go -USE_GITHUB= nodefault # the main code is in GH_TUPLE +USES= gl go xorg +USE_GITHUB= yes GH_ACCOUNT= liamg -GH_TUPLE= liamg:aminal:${DISTVERSIONFULL}:main/src/github.com/liamg/aminal \ - BurntSushi:xgb:27f1227:xgb/src/github.com/BurntSushi/xgb \ - gen2brain:shm:6c18ff7:shm/src/github.com/gen2brain/shm -GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} +GH_TUPLE= BurntSushi:xgb:27f1227:xgb/vendor/github.com/BurntSushi/xgb \ + gen2brain:shm:6c18ff7:shm/vendor/github.com/gen2brain/shm USE_GL= gl USE_XORG= x11 xcursor xi xinerama xrandr xxf86vm -MAKE_ENV= CGO_CFLAGS="-I${LOCALBASE}/include" CGO_LDFLAGS="-L${LOCALBASE}/lib" +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} PORTSCOUT= limit:^[0-9].* post-patch: # https://github.com/liamg/aminal/issues/208 - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/platform && \ + @cd ${WRKSRC}/platform && \ ${CP} linuxLaunch.go freebsdLaunch.go && \ ${REINPLACE_CMD} 's|build linux|build freebsd|' freebsdLaunch.go -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./... - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - .include <bsd.port.mk> diff --git a/x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go b/x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go index 45ec8ada52a4..3ea0becd1031 100644 --- a/x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go +++ b/x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go @@ -1,5 +1,5 @@ ---- src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go.orig 2018-12-15 01:47:38 UTC -+++ src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go +--- vendor/github.com/riywo/loginshell/loginshell.go.orig 2018-12-15 01:47:38 UTC ++++ vendor/github.com/riywo/loginshell/loginshell.go @@ -15,6 +15,8 @@ func Shell() (string, error) { switch runtime.GOOS { case "linux": |