Re: gnupg 1.4 and guile 1.6 ports

[Alec Berryman <alec_(_at_)_thened_(_dot_)_net>]

Chris K. Young on 2004-12-27 04:50:54 +1259:

> URL: http://filedrop.hedgee.com/ports/openbsd/
> 
> These ports are, respectively, for gnupg-1.4.0 and guile-1.6.7, and are
> tested (by which I mean ``make regress'') to work on 3.6-stable on i386.
> Feedback is most welcome from people who use -current and/or non-i386
> platforms.
> 
> They are based respectively on the gnupg-1.2.2 and guile-1.4 ports,
> the versions that currently exist for 3.6-stable. The most significant
> changes I've made are:
> 
> + gnupg-1.4.0 has smart card support, which uses libusb. So I added a
>   ``card'' flavour, which depends on devel/libusb.
> 
> + gnupg-1.4.0 also has readline support. OpenBSD's built-in libreadline
>   does not implicitly depend on a termcap library, a situation that the
>   gnupg configure.ac doesn't address. So I filched a termcap lib check
>   from guile-readline. If there is a more correct way to do this, feel
>   free to let me know. :-)

Attached is Chris' .tar.gz update (arg!) for gnupg-1.4.0 as a diff to
-current.  Tested and works on -current i386/gcc3.  I have no USB
device with which to test card support.

Changes not represented in the diff:
delete patches/patch-Makefile_in
delete patches/patch-aclocal_m4
delete patches/patch-g10_getkey_c
delete patches/patch-g10_keygen_c
delete patches/patch-mpii_Makefile_in
delete patches/patch-mpi_config_links
delete patches/patch-po-Makefile.in.in
rename patches/patch-doc_Makefile.in -> patches/patch-doc_Makefile_in

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- Makefile	5 Jan 2005 19:45:26 -0000	1.46
+++ Makefile	8 Jan 2005 18:26:01 -0000
@@ -2,8 +2,8 @@
 
 COMMENT=	"GNU privacy guard - a free PGP replacement"
 
-DISTNAME=	gnupg-1.2.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	gnupg-1.4.0
+PKGNAME=	${DISTNAME}
 CATEGORIES=	security
 
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
@@ -31,16 +31,16 @@
 MODULES= devel/gettext
 
 CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.52
+AUTOCONF_VERSION= 2.59
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts
 CONFIGURE_ARGS+= --disable-ldap
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-FLAVORS=	idea
+FLAVORS=	idea card
 FLAVOR?=
 
-.if ${FLAVOR:L} == "idea"
+.if ${FLAVOR:L:Midea}
 PERMIT_PACKAGE_CDROM=	"a patented algorithm"
 PERMIT_DISTFILES_CDROM=	"a patented algorithm"
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} idea.c.gz:0
@@ -50,6 +50,13 @@
 .else
 SUPDISTFILES=	idea.c.gz:0
 .endif
+
+.if ${FLAVOR:L:Mcard}
+LIB_DEPENDS+=		usb::devel/libusb
+.else
+CONFIGURE_ARGS+=	--disable-card-support
+.endif
+
 
 GNUPGDOCFILES=	README AUTHORS COPYING THANKS TODO BUGS \
 		doc/DETAILS doc/FAQ doc/OpenPGP doc/HACKING doc/faq.html
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/gnupg/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	5 Jan 2005 19:45:26 -0000	1.7
+++ distinfo	8 Jan 2005 18:26:01 -0000
@@ -1,8 +1,8 @@
-MD5 (gnupg-1.2.2.tar.gz) = 01cf9c6b949603d0511f6fc07bc758d2
+MD5 (gnupg-1.4.0.tar.gz) = 74e407a8dcb09866555f79ae797555da
 MD5 (idea.c.gz) = 9dc3bc086824a8c7a331f35e09a3e57f
-RMD160 (gnupg-1.2.2.tar.gz) = 0e63968f9d48fe51765d0c0a8e212edf321a4eb2
+RMD160 (gnupg-1.4.0.tar.gz) = b4d640e3f74557a0c7c3f73de7eebc07b9584fe0
 RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d
-SHA1 (gnupg-1.2.2.tar.gz) = 4144c74b78f79beda60f98ec929f44e29ecd45f9
+SHA1 (gnupg-1.4.0.tar.gz) = 7078b8f14f21d04c7bc9d988a6a2f08d703fbc83
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
-SIZE (gnupg-1.2.2.tar.gz) = 3183869
+SIZE (gnupg-1.4.0.tar.gz) = 3929941
 SIZE (idea.c.gz) = 5216
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/security/gnupg/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -r1.3 patch-configure_ac
--- patches/patch-configure_ac	27 May 2003 14:54:43 -0000	1.3
+++ patches/patch-configure_ac	8 Jan 2005 18:26:01 -0000
@@ -1,12 +1,19 @@
-$OpenBSD: patch-configure_ac,v 1.3 2003/05/27 14:54:43 brad Exp $
---- configure.ac.orig	Thu May  1 08:27:05 2003
-+++ configure.ac	Mon May 12 01:45:38 2003
-@@ -500,7 +500,7 @@ NAME_OF_DEV_RANDOM="/dev/random"
+--- configure.ac	Thu Dec 16 23:04:14 2004
++++ configure.ac	Mon Dec 27 00:05:42 2004
+@@ -690,7 +690,7 @@
  NAME_OF_DEV_URANDOM="/dev/urandom"
- case "${target}" in
+ case "${host}" in
      *-openbsd*)
 -        NAME_OF_DEV_RANDOM="/dev/srandom"
 +        NAME_OF_DEV_RANDOM="/dev/arandom"
          NAME_OF_DEV_URANDOM="/dev/urandom"
          ;;
  esac
+@@ -1166,6 +1166,7 @@
+ # Check for readline support
+ #
+ if test "$readline_support" = yes ; then
++    AC_SEARCH_LIBS(tgoto, ncurses curses termcap terminfo termlib)
+     AC_CHECK_LIB(readline, add_history)
+     AC_CHECK_HEADERS([readline/readline.h])
+ fi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg/pkg/PLIST,v
retrieving revision 1.15
diff -u -r1.15 PLIST
--- pkg/PLIST	15 Sep 2004 18:35:59 -0000	1.15
+++ pkg/PLIST	8 Jan 2005 18:26:01 -0000
@@ -5,8 +5,12 @@
 @info info/gpg.info
 @info info/gpgv.info
 libexec/gnupg/
+libexec/gnupg/gpgkeys_finger
+libexec/gnupg/gpgkeys_hkp
+libexec/gnupg/gpgkeys_http
 libexec/gnupg/gpgkeys_mailto
 @man man/man1/gpg.1
+_(_at_)_man man/man1/gpg.ru.1
 @man man/man1/gpgv.1
 @man man/man7/gnupg.7
 share/doc/gnupg/
@@ -23,6 +27,9 @@
 share/doc/gnupg/faq.html
 share/gnupg/
 share/gnupg/options.skel
+share/locale/be/
+share/locale/be/LC_MESSAGES/
+share/locale/be/LC_MESSAGES/gnupg.mo
 share/locale/ca/
 share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/gnupg.mo
@@ -30,6 +37,8 @@
 share/locale/da/LC_MESSAGES/gnupg.mo
 share/locale/de/LC_MESSAGES/gnupg.mo
 share/locale/el/LC_MESSAGES/gnupg.mo
+share/locale/en_(_at_)_boldquot/LC_MESSAGES/gnupg.mo
+share/locale/en_(_at_)_quot/LC_MESSAGES/gnupg.mo
 share/locale/eo/LC_MESSAGES/gnupg.mo
 share/locale/es/LC_MESSAGES/gnupg.mo
 share/locale/et/LC_MESSAGES/gnupg.mo
@@ -40,11 +49,13 @@
 share/locale/id/LC_MESSAGES/gnupg.mo
 share/locale/it/LC_MESSAGES/gnupg.mo
 share/locale/ja/LC_MESSAGES/gnupg.mo
-share/locale/nl/LC_MESSAGES/gnupg.mo
 share/locale/pl/LC_MESSAGES/gnupg.mo
 share/locale/pt/LC_MESSAGES/gnupg.mo
 share/locale/pt_BR/LC_MESSAGES/gnupg.mo
+share/locale/ro/LC_MESSAGES/gnupg.mo
+share/locale/ru/LC_MESSAGES/gnupg.mo
 share/locale/sk/LC_MESSAGES/gnupg.mo
 share/locale/sv/LC_MESSAGES/gnupg.mo
 share/locale/tr/LC_MESSAGES/gnupg.mo
+share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 share/locale/zh_TW/LC_MESSAGES/gnupg.mo