Make this package work on Solaris.

3 files changed, 57 insertions, 45 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index c08b5c769e9..25cee3b84f7 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/04/08 15:22:40 mellon Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/09 09:39:20 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -9,10 +9,15 @@ MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/
 MAINTAINER=	packages@NetBSD.ORG
 HOMEPAGE=	http://www.gnupg.org
 
-.include "../../mk/bsd.prefs.mk"
-
 GNU_CONFIGURE=  yes
 RESTRICTED=	"Cryptographic software"
 MIRROR_DISTFILE=no
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+DEPENDS+=	zlib-1.1.3:../../devel/zlib
+LDFLAGS+=	-L${LOCALBASE}/lib
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index f4b95f3ec5b..6757bf84f2f 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,42 +1,49 @@
-$NetBSD: patch-ab,v 1.2 1999/04/08 15:17:28 mellon Exp $
+$NetBSD: patch-ab,v 1.3 1999/04/09 09:39:20 agc Exp $
 
-diff -rc2 configure configure
-*** configure	Sat Mar 20 04:34:01 1999
---- configure	Wed Apr  7 17:38:32 1999
-***************
-*** 1597,1600 ****
---- 1597,1607 ----
-  esac
-  
-+ case "$target" in
-+ i[3456]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
-+   ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-+   ac_symxfrm='_\1 \1'
-+   ;;
-+ esac
-+ 
-  # If we're using GNU nm, then use its standard symbol codes.
-  if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-***************
-*** 1841,1845 ****
-              ;;
-  
-!           freebsd2* | osf4* )
-              CFLAGS_RDYNAMIC=""
-              ;;
---- 1848,1852 ----
-              ;;
-  
-!           freebsd2* | osf4* | netbsd*)
-              CFLAGS_RDYNAMIC=""
-              ;;
-***************
-*** 1879,1882 ****
---- 1886,1892 ----
-          NAME_OF_DEV_RANDOM="/dev/srandom"
-          NAME_OF_DEV_URANDOM="/dev/urandom"
-+         DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
-+         ;;
-+     *-netbsd*)
-          DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
-          ;;
+Make this work on NetBSD.
+For Solaris, make the DATADIRNAME share.
+
+--- configure.orig	Sat Mar 20 09:34:01 1999
++++ configure	Fri Apr  9 10:28:33 1999
+@@ -1596,6 +1596,13 @@
+   ;;
+ esac
+ 
++case "$target" in
++i[3456]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
++  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
++  ac_symxfrm='_\1 \1'
++  ;;
++esac
++
+ # If we're using GNU nm, then use its standard symbol codes.
+ if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+   ac_symcode='[ABCDGISTUW]'
+@@ -1840,7 +1847,7 @@
+             CFLAGS_RDYNAMIC="-Wl,-dy"
+             ;;
+ 
+-          freebsd2* | osf4* )
++          freebsd2* | osf4* | netbsd*)
+             CFLAGS_RDYNAMIC=""
+             ;;
+           * )
+@@ -1880,6 +1887,9 @@
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
+         ;;
++    *-netbsd*)
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
++        ;;
+     *)
+         NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+@@ -3248,7 +3258,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
diff --git a/security/gnupg/pkg/COMMENT b/security/gnupg/pkg/COMMENT
index 59f061a7ed8..32327e85189 100644
--- a/security/gnupg/pkg/COMMENT
+++ b/security/gnupg/pkg/COMMENT
@@ -1 +1 @@
-GNU Privacy Gard (PGP)
+Privacy Guard, a public-Key encryption and digital signature utility