summaryrefslogtreecommitdiff
path: root/databases/redigo
diff options
context:
space:
mode:
authorJulien Laffaye <jlaffaye@FreeBSD.org>2014-01-11 17:46:33 +0000
committerJulien Laffaye <jlaffaye@FreeBSD.org>2014-01-11 17:46:33 +0000
commit257ee41338fa361d936d5d29b3954f46e3bcec92 (patch)
tree2f8ae2a36fa3a470da851493054d7f7fafb0b259 /databases/redigo
parent- Update from 0.20131001 to 0.20140106 (diff)
- Change default location of Go packages to LOCALBASE/share/go
This fixes problems like ports failing to build if the port is already installed [1] - Bump PORTREVISION of affected ports - Support the install target in bsd.go.mk - STAGE support for free! PR: ports/180003 [1]
Notes
Notes: svn path=/head/; revision=339441
Diffstat (limited to 'databases/redigo')
-rw-r--r--databases/redigo/Makefile13
-rw-r--r--databases/redigo/pkg-plist24
2 files changed, 20 insertions, 17 deletions
diff --git a/databases/redigo/Makefile b/databases/redigo/Makefile
index 36e8afce60e0..cc3ac91a3052 100644
--- a/databases/redigo/Makefile
+++ b/databases/redigo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= redigo
PORTVERSION= 20130702
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= LOCAL/gblach/
@@ -10,17 +11,7 @@ MAINTAINER= gblach@FreeBSD.org
COMMENT= Go client for the Redis database
WRKSRC= ${WRKDIR}/${DISTNAME}/redis
-SUBLIBDIR= github.com/garyburd/${PORTNAME}
-GO_PKGNAME= ${SUBLIBDIR}/redis
-
-NO_STAGE= yes
-do-install:
- ${MKDIR} ${GO_LOCAL_LIBDIR}/${SUBLIBDIR}
- ${INSTALL_DATA} ${GO_WRKDIR_PKG}/${SUBLIBDIR}/redis.a ${GO_LOCAL_LIBDIR}/${SUBLIBDIR}
- ${MKDIR} ${GO_LOCAL_SRCDIR}/${GO_PKGNAME}
-.for f in conn.go doc.go log.go pool.go pubsub.go redis.go reply.go scan.go script.go
- ${INSTALL_DATA} ${GO_WRKSRC}/${f} ${GO_LOCAL_SRCDIR}/${GO_PKGNAME}
-.endfor
+GO_PKGNAME= github.com/garyburd/${PORTNAME}/redis
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
diff --git a/databases/redigo/pkg-plist b/databases/redigo/pkg-plist
index 7176b2ecdfa1..40d252df7853 100644
--- a/databases/redigo/pkg-plist
+++ b/databases/redigo/pkg-plist
@@ -1,17 +1,29 @@
-%%GO_LIBDIR%%/github.com/garyburd/redigo/redis.a
+%%GO_LIBDIR%%/%%GO_PKGNAME%%.a
%%GO_SRCDIR%%/%%GO_PKGNAME%%/conn.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/conn_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/doc.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/log.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/pool.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/pool_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/pubsub.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/pubsub_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/redis.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/reply.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/reply_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/scan.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/scan_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/script.go
-@dirrm %%GO_LIBDIR%%/github.com/garyburd/redigo
-@dirrmtry %%GO_LIBDIR%%/github.com/garyburd
-@dirrmtry %%GO_LIBDIR%%/github.com
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%
-@dirrm %%GO_SRCDIR%%/github.com/garyburd/redigo
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/script_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/test_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/zpop_example_test.go
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%
+@dirrmtry %%GO_SRCDIR%%/github.com/garyburd/redigo
@dirrmtry %%GO_SRCDIR%%/github.com/garyburd
@dirrmtry %%GO_SRCDIR%%/github.com
+@dirrmtry %%GO_SRCDIR%%
+@dirrmtry %%GO_LIBDIR%%/github.com/garyburd/redigo
+@dirrmtry %%GO_LIBDIR%%/github.com/garyburd
+@dirrmtry %%GO_LIBDIR%%/github.com
+@dirrmtry %%GO_LIBDIR%%
+@dirrmtry share/go/pkg
+@dirrmtry share/go