Index: head/security/gnupg1/Makefile =================================================================== --- head/security/gnupg1/Makefile (revision 309334) +++ head/security/gnupg1/Makefile (revision 309335) @@ -1,106 +1,102 @@ -# New ports collection makefile for: gnupg -# Date created: Sep 30, 1998 -# Whom: kuriyama@FreeBSD.org -# # $FreeBSD$ -# +# Created by: kuriyama@FreeBSD.org PORTNAME= gnupg -PORTVERSION= 1.4.12 +PORTVERSION= 1.4.13 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= kuriyama@FreeBSD.org COMMENT= The GNU Privacy Guard USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES .if ${MACHINE_CPU:Mi586} MACHINE_ARCH= i586 .endif CFLAGS:= ${CFLAGS:S/-pipe//g} .if ${CC} == "clang" CFLAGS:= ${CFLAGS:S/$/ -std=c89/} .endif MAN1= gpg.1 gpgv.1 gpg.ru.1 gpg-zip.1 MAN7= gnupg.7 INFO= gnupg1 DOCSDIR= ${PREFIX}/share/doc/gnupg1 LATEST_LINK= gnupg1 PORTDOCS= * OPTIONS= LDAP "LDAP keyserver interface" off \ LIBICONV "use libiconv" off \ LIBUSB "use libusb" off \ SUID_GPG "install GPG with suid" off \ NLS "Native Language Support" on \ CURL "use libcurl for the keyserver interface" on .include .if defined(WITH_LIBICONV) USE_ICONV= yes .else CONFIGURE_ARGS+= --without-libiconv-prefix .endif .if defined(WITH_LIBUSB) CONFIGURE_ARGS+= --with-libusb=${LOCALBASE} . if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb . endif .else CONFIGURE_ARGS+= --without-libusb .endif .if defined(WITH_LDAP) USE_OPENLDAP= yes PLIST_SUB+= WITH_LDAP="" CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} #CONFIGURE_ENV+= LDFLAGS="-L/usr/lib" .else PLIST_SUB+= WITH_LDAP="@comment " CONFIGURE_ARGS+= --disable-ldap .endif .if !defined(WITHOUT_NLS) USE_GETTEXT= YES PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif .if !defined(WITHOUT_CURL) LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} # Work around a GnuPG configure buglet CONFIGURE_ENV+= _libcurl_config=${LOCALBASE}/bin/curl-config .else CONFIGURE_ARGS+=--without-libcurl .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for i in DETAILS FAQ HACKING OpenPGP ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} .endfor .for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \ README THANKS TODO VERSION ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif .if defined(WITH_SUID_GPG) ${CHMOD} u+s ${PREFIX}/bin/gpg .endif check: (cd ${WRKSRC}; ${MAKE} check) .include Index: head/security/gnupg1/distinfo =================================================================== --- head/security/gnupg1/distinfo (revision 309334) +++ head/security/gnupg1/distinfo (revision 309335) @@ -1,4 +1,4 @@ -SHA256 (gnupg-1.4.12.tar.bz2) = 4f03ca6902aaee79d0eda00eea0fefde7db9eb005d8ffd54fac9806bc24050ec -SIZE (gnupg-1.4.12.tar.bz2) = 3584133 -SHA256 (gnupg-1.4.12.tar.bz2.sig) = 5341c94972cd7ef87444be95756cae07e7d295d7cc674e3507c2dbe19edb0995 -SIZE (gnupg-1.4.12.tar.bz2.sig) = 287 +SHA256 (gnupg-1.4.13.tar.bz2) = 72a24dd318472f0c8f0d00ebe19fb4bcf43e30845bcc92a8ae43c810df295d5a +SIZE (gnupg-1.4.13.tar.bz2) = 3685873 +SHA256 (gnupg-1.4.13.tar.bz2.sig) = 570b3b34776c7ff17cfce0c21378fb780a0e0a51f7f650c0dfd966927856abee +SIZE (gnupg-1.4.13.tar.bz2.sig) = 287 Index: head/security/gnupg1/files/patch-doc:Makefile.in =================================================================== --- head/security/gnupg1/files/patch-doc:Makefile.in (revision 309334) +++ head/security/gnupg1/files/patch-doc:Makefile.in (revision 309335) @@ -1,40 +1,40 @@ ---- doc/Makefile.in.orig 2012-01-30 23:20:15.000000000 +0900 -+++ doc/Makefile.in 2012-01-31 07:29:49.582744237 +0900 -@@ -33,7 +33,7 @@ - # along with this program; if not, see . - - VPATH = @srcdir@ +--- doc/Makefile.in.orig 2012-12-21 04:30:34.000000000 +0900 ++++ doc/Makefile.in 2012-12-21 09:36:23.407499114 +0900 +@@ -50,7 +50,7 @@ + esac; \ + test $$am__dry = yes; \ + } -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(datadir)/doc/gnupg1 pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -316,7 +316,11 @@ +@@ -352,7 +352,11 @@ # Need this to avoid building of dvis with automake 1.4 DVIS = +ifdef NOPORTDOCS +pkgdata_DATA = +else pkgdata_DATA = FAQ +endif # we can't add gpg.texi gpgv.texi here because automake does not like them to - # be built files. -@@ -603,6 +607,8 @@ - echo " ( cd '$(DESTDIR)$(man7dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man7dir)" && rm -f $$files; } + # be built files. +@@ -647,6 +651,8 @@ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir) install-pkgdataDATA: $(pkgdata_DATA) +ifdef NOPORTDOCS +else @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ -@@ -614,6 +620,7 @@ + if test -n "$$list"; then \ +@@ -661,6 +667,7 @@ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ done +endif uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) Index: head/security/gnupg1/files/patch-g10:Makefile.in =================================================================== --- head/security/gnupg1/files/patch-g10:Makefile.in (revision 309334) +++ head/security/gnupg1/files/patch-g10:Makefile.in (revision 309335) @@ -1,40 +1,40 @@ ---- g10/Makefile.in.orig 2012-01-30 23:20:15.000000000 +0900 -+++ g10/Makefile.in 2012-01-31 07:30:57.305617061 +0900 -@@ -35,7 +35,7 @@ - - - VPATH = @srcdir@ +--- g10/Makefile.in.orig 2012-12-21 04:30:34.000000000 +0900 ++++ g10/Makefile.in 2012-12-21 09:37:38.552438682 +0900 +@@ -52,7 +52,7 @@ + esac; \ + test $$am__dry = yes; \ + } -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(datadir)/doc/gnupg1 pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -363,7 +363,11 @@ +@@ -399,7 +399,11 @@ @LIBUSB_CPPFLAGS@ $(am__append_1) needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS) +ifdef NOPORTDOCS +dist_pkgdata_DATA = +else dist_pkgdata_DATA = options.skel +endif @ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source = @ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c common_source = \ -@@ -622,6 +626,8 @@ +@@ -661,6 +665,8 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-dist_pkgdataDATA: $(dist_pkgdata_DATA) +ifdef NOPORTDOCS +else @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ -@@ -633,6 +639,7 @@ + if test -n "$$list"; then \ +@@ -675,6 +681,7 @@ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ done +endif uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL)