diff options
| -rw-r--r-- | net-im/centericq/Makefile | 2 | ||||
| -rw-r--r-- | net/centericq/Makefile | 2 | ||||
| -rw-r--r-- | security/gpa/Makefile | 2 | ||||
| -rw-r--r-- | security/gpgme/Makefile | 2 | ||||
| -rw-r--r-- | security/gpgme/distinfo | 4 | ||||
| -rw-r--r-- | security/gpgme/files/patch-gpgme-Makefile.in | 106 | ||||
| -rw-r--r-- | security/gpgme/files/patch-gpgme-ath-pthread-compat.c | 11 | ||||
| -rw-r--r-- | security/gpgme/pkg-plist | 6 | ||||
| -rw-r--r-- | security/seahorse/Makefile | 2 |
9 files changed, 21 insertions, 116 deletions
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile index 0e25f4136dde..1732cc079ca8 100644 --- a/net-im/centericq/Makefile +++ b/net-im/centericq/Makefile @@ -8,7 +8,7 @@ PORTNAME= centericq PORTVERSION= 4.21.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://centericq.de/archive/source/releases/ \ http://thekonst.net/download/ diff --git a/net/centericq/Makefile b/net/centericq/Makefile index 0e25f4136dde..1732cc079ca8 100644 --- a/net/centericq/Makefile +++ b/net/centericq/Makefile @@ -8,7 +8,7 @@ PORTNAME= centericq PORTVERSION= 4.21.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://centericq.de/archive/source/releases/ \ http://thekonst.net/download/ diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 43382d2c503b..139f8ab009cb 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -7,7 +7,7 @@ PORTNAME= gpa PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= alpha/gpa diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index ff2fedb27de4..06b5c4553e92 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gpgme -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gpgme diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 516ded266792..ec59b2a48b4e 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,2 +1,2 @@ -MD5 (gpgme-1.0.2.tar.gz) = 3be11bbaa94af352ed6841ad3e296a2f -SIZE (gpgme-1.0.2.tar.gz) = 833949 +MD5 (gpgme-1.0.3.tar.gz) = 4d33cbdf844fcee1c724e4cf2a32dd11 +SIZE (gpgme-1.0.3.tar.gz) = 837866 diff --git a/security/gpgme/files/patch-gpgme-Makefile.in b/security/gpgme/files/patch-gpgme-Makefile.in deleted file mode 100644 index da0237615789..000000000000 --- a/security/gpgme/files/patch-gpgme-Makefile.in +++ /dev/null @@ -1,106 +0,0 @@ ---- gpgme/Makefile.in.orig Mon Aug 8 16:43:55 2005 -+++ gpgme/Makefile.in Mon Aug 8 16:44:07 2005 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.3 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -36,8 +36,6 @@ - - - --SOURCES = $(libgpgme_pth_la_SOURCES) $(libgpgme_pthread_la_SOURCES) $(libgpgme_real_la_SOURCES) $(libgpgme_la_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -121,9 +119,9 @@ - libgpgme_real_la_OBJECTS = $(am_libgpgme_real_la_OBJECTS) - am__libgpgme_la_SOURCES_DIST = ath.h ath-compat.c ath-pth-compat.c \ - ath-pthread-compat.c --@HAVE_PTH_TRUE@am__objects_3 = ath-pth-compat.lo --@HAVE_PTHREAD_TRUE@am__objects_4 = ath-pthread-compat.lo --am_libgpgme_la_OBJECTS = ath-compat.lo $(am__objects_3) \ -+@HAVE_PTH_TRUE@am__objects_3 = libgpgme_la-ath-pth-compat.lo -+@HAVE_PTHREAD_TRUE@am__objects_4 = libgpgme_la-ath-pthread-compat.lo -+am_libgpgme_la_OBJECTS = libgpgme_la-ath-compat.lo $(am__objects_3) \ - $(am__objects_4) - libgpgme_la_OBJECTS = $(am_libgpgme_la_OBJECTS) - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -@@ -334,6 +332,7 @@ - libgpgme_pthread_la_SOURCES = ath.h ath-pthread.c - libgpgme_pth_la_SOURCES = ath.h ath-pth.c - AM_CPPFLAGS = $(assuan_cppflags) @GPG_ERROR_CFLAGS@ -+libgpgme_la_CFLAGS = ${CFLAGS} @PTH_CFLAGS@ - libgpgme_la_LDFLAGS = $(libgpgme_version_script_cmd) -version-info \ - @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ - -@@ -352,6 +351,7 @@ - libgpgme_pthread_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \ - -lpthread @GPG_ERROR_LIBS@ - -+libgpgme_pth_la_CFLAGS = ${CFLAGS} @PTH_CFLAGS@ - libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@ - libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \ - $(libgpgme_version_script_cmd) -version-info \ -@@ -476,9 +476,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ttyname_r.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-compat.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pth-compat.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pthread-compat.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pthread.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conversion.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-compat.Plo@am__quote@ -@@ -504,6 +501,9 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/import.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keylist.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_la-ath-compat.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_la-ath-pth-compat.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_la-ath-pthread-compat.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-ath-pth.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/op-support.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passphrase.Plo@am__quote@ -@@ -548,11 +548,32 @@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libgpgme_pth_la-ath-pth.lo: ath-pth.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgpgme_pth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-ath-pth.lo -MD -MP -MF "$(DEPDIR)/libgpgme_pth_la-ath-pth.Tpo" -c -o libgpgme_pth_la-ath-pth.lo `test -f 'ath-pth.c' || echo '$(srcdir)/'`ath-pth.c; \ -+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgpgme_pth_la_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-ath-pth.lo -MD -MP -MF "$(DEPDIR)/libgpgme_pth_la-ath-pth.Tpo" -c -o libgpgme_pth_la-ath-pth.lo `test -f 'ath-pth.c' || echo '$(srcdir)/'`ath-pth.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgpgme_pth_la-ath-pth.Tpo" "$(DEPDIR)/libgpgme_pth_la-ath-pth.Plo"; else rm -f "$(DEPDIR)/libgpgme_pth_la-ath-pth.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ath-pth.c' object='libgpgme_pth_la-ath-pth.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgpgme_pth_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-ath-pth.lo `test -f 'ath-pth.c' || echo '$(srcdir)/'`ath-pth.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgpgme_pth_la_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-ath-pth.lo `test -f 'ath-pth.c' || echo '$(srcdir)/'`ath-pth.c -+ -+libgpgme_la-ath-compat.lo: ath-compat.c -+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_la_CFLAGS) $(CFLAGS) -MT libgpgme_la-ath-compat.lo -MD -MP -MF "$(DEPDIR)/libgpgme_la-ath-compat.Tpo" -c -o libgpgme_la-ath-compat.lo `test -f 'ath-compat.c' || echo '$(srcdir)/'`ath-compat.c; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgpgme_la-ath-compat.Tpo" "$(DEPDIR)/libgpgme_la-ath-compat.Plo"; else rm -f "$(DEPDIR)/libgpgme_la-ath-compat.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ath-compat.c' object='libgpgme_la-ath-compat.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_la_CFLAGS) $(CFLAGS) -c -o libgpgme_la-ath-compat.lo `test -f 'ath-compat.c' || echo '$(srcdir)/'`ath-compat.c -+ -+libgpgme_la-ath-pth-compat.lo: ath-pth-compat.c -+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_la_CFLAGS) $(CFLAGS) -MT libgpgme_la-ath-pth-compat.lo -MD -MP -MF "$(DEPDIR)/libgpgme_la-ath-pth-compat.Tpo" -c -o libgpgme_la-ath-pth-compat.lo `test -f 'ath-pth-compat.c' || echo '$(srcdir)/'`ath-pth-compat.c; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgpgme_la-ath-pth-compat.Tpo" "$(DEPDIR)/libgpgme_la-ath-pth-compat.Plo"; else rm -f "$(DEPDIR)/libgpgme_la-ath-pth-compat.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ath-pth-compat.c' object='libgpgme_la-ath-pth-compat.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_la_CFLAGS) $(CFLAGS) -c -o libgpgme_la-ath-pth-compat.lo `test -f 'ath-pth-compat.c' || echo '$(srcdir)/'`ath-pth-compat.c -+ -+libgpgme_la-ath-pthread-compat.lo: ath-pthread-compat.c -+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_la_CFLAGS) $(CFLAGS) -MT libgpgme_la-ath-pthread-compat.lo -MD -MP -MF "$(DEPDIR)/libgpgme_la-ath-pthread-compat.Tpo" -c -o libgpgme_la-ath-pthread-compat.lo `test -f 'ath-pthread-compat.c' || echo '$(srcdir)/'`ath-pthread-compat.c; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgpgme_la-ath-pthread-compat.Tpo" "$(DEPDIR)/libgpgme_la-ath-pthread-compat.Plo"; else rm -f "$(DEPDIR)/libgpgme_la-ath-pthread-compat.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ath-pthread-compat.c' object='libgpgme_la-ath-pthread-compat.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_la_CFLAGS) $(CFLAGS) -c -o libgpgme_la-ath-pthread-compat.lo `test -f 'ath-pthread-compat.c' || echo '$(srcdir)/'`ath-pthread-compat.c - - mostlyclean-libtool: - -rm -f *.lo diff --git a/security/gpgme/files/patch-gpgme-ath-pthread-compat.c b/security/gpgme/files/patch-gpgme-ath-pthread-compat.c new file mode 100644 index 000000000000..7fec8e8c55aa --- /dev/null +++ b/security/gpgme/files/patch-gpgme-ath-pthread-compat.c @@ -0,0 +1,11 @@ +--- gpgme/ath-pth-compat.c.orig Tue Nov 1 10:25:41 2005 ++++ gpgme/ath-pth-compat.c Tue Nov 1 10:25:55 2005 +@@ -20,7 +20,7 @@ + + #include <stdlib.h> + #include <errno.h> +-#include <pth.h> ++#include <pth/pth.h> + + #include "ath.h" + diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist index c6b206fc5efe..4cc5e48d32a3 100644 --- a/security/gpgme/pkg-plist +++ b/security/gpgme/pkg-plist @@ -2,12 +2,12 @@ bin/gpgme-config include/gpgme/gpgme.h %%WITH_PTH%%lib/libgpgme-pth.a %%WITH_PTH%%lib/libgpgme-pth.so -%%WITH_PTH%%lib/libgpgme-pth.so.14 +%%WITH_PTH%%lib/libgpgme-pth.so.15 lib/libgpgme-pthread.a lib/libgpgme-pthread.so -lib/libgpgme-pthread.so.14 +lib/libgpgme-pthread.so.15 lib/libgpgme.a lib/libgpgme.so -lib/libgpgme.so.14 +lib/libgpgme.so.15 share/aclocal/gpgme.m4 @dirrm include/gpgme diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 03e2056751f6..a6a858716966 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -8,7 +8,7 @@ PORTNAME= seahorse PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8 |