2 files changed, 49 insertions, 50 deletions

diff --git a/security/go.crypto/Makefile b/security/go.crypto/Makefile
index 2aa40a35b0fa..b31cad86a443 100644
--- a/security/go.crypto/Makefile
+++ b/security/go.crypto/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	go.crypto
 PORTVERSION=	20130706
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://jlaffaye.net/ LOCAL/jlaffaye
 
@@ -19,11 +20,17 @@ GO_TARGET=	${GO_PKGNAME}/bcrypt		\
 		${GO_PKGNAME}/nacl/secretbox	\
 		${GO_PKGNAME}/ocsp		\
 		${GO_PKGNAME}/openpgp		\
+		${GO_PKGNAME}/openpgp/armor	\
+		${GO_PKGNAME}/openpgp/elgamal	\
+		${GO_PKGNAME}/openpgp/errors	\
+		${GO_PKGNAME}/openpgp/packet	\
+		${GO_PKGNAME}/openpgp/s2k	\
 		${GO_PKGNAME}/otr		\
 		${GO_PKGNAME}/pbkdf2		\
 		${GO_PKGNAME}/poly1305		\
 		${GO_PKGNAME}/ripemd160		\
 		${GO_PKGNAME}/salsa20		\
+		${GO_PKGNAME}/salsa20/salsa	\
 		${GO_PKGNAME}/scrypt		\
 		${GO_PKGNAME}/sha3		\
 		${GO_PKGNAME}/ssh		\
@@ -31,17 +38,6 @@ GO_TARGET=	${GO_PKGNAME}/bcrypt		\
 		${GO_PKGNAME}/xtea		\
 		${GO_PKGNAME}/xts
 
-NO_STAGE=	yes
-do-install:
-	${MKDIR} ${GO_LOCAL_LIBDIR}/${GO_PKGNAME}
-	(cd ${GO_WRKDIR_PKG}/ && ${COPYTREE_SHARE} \* \
-		${GO_LOCAL_LIBDIR})
-.for t in ${GO_TARGET}
-	${MKDIR} ${GO_LOCAL_SRCDIR}/${t}
-	(cd ${GO_WRKDIR_SRC}/${t}/ && ${COPYTREE_SHARE} \* \
-		${GO_LOCAL_SRCDIR}/${t})
-.endfor
-
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
 .include <bsd.port.post.mk>
diff --git a/security/go.crypto/pkg-plist b/security/go.crypto/pkg-plist
index ab174c62dffa..d2607aab29a4 100644
--- a/security/go.crypto/pkg-plist
+++ b/security/go.crypto/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/bcrypt.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/blowfish.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/bn256.a
@@ -178,43 +177,47 @@
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/xtea/xtea_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/xts/xts.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/xts/xts_test.go
-@dirrm %%GO_LIBDIR%%/%%GO_PKGNAME%%/salsa20
-@dirrm %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp
-@dirrm %%GO_LIBDIR%%/%%GO_PKGNAME%%/nacl
-@dirrm %%GO_LIBDIR%%/%%GO_PKGNAME%%
-@dirrmtry %%GO_LIBDIR%%/code.google.com/p
-@dirrmtry %%GO_LIBDIR%%/code.google.com
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/xts
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/xtea
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/twofish
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/test
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/terminal
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/scrypt
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/ripemd160
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/poly1305
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/pbkdf2
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/otr
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/s2k
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/errors
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/elgamal
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/clearsign
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/ocsp
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/secretbox
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/box
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/md4
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/curve25519
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/cast5
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/bn256
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/blowfish
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt
-@dirrm %%GO_SRCDIR%%/%%GO_PKGNAME%%
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/xts
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/xtea
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/twofish
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/test
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/terminal
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/scrypt
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ripemd160
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/poly1305
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/pbkdf2
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/otr
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/s2k
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/errors
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/elgamal
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/clearsign
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ocsp
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/secretbox
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/box
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/md4
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/curve25519
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/cast5
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/bn256
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/blowfish
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt
+@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%
 @dirrmtry %%GO_SRCDIR%%/code.google.com/p
 @dirrmtry %%GO_SRCDIR%%/code.google.com
+@dirrmtry %%GO_SRCDIR%%
+@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/salsa20
+@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp
+@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/nacl
+@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%
+@dirrmtry %%GO_LIBDIR%%/code.google.com/p
+@dirrmtry %%GO_LIBDIR%%/code.google.com
+@dirrmtry %%GO_LIBDIR%%
+@dirrmtry share/go/pkg
+@dirrmtry share/go