From 9845531bbe293a7fda403e2996376c7ff812bcfb Mon Sep 17 00:00:00 2001 From: ghen Date: Tue, 23 May 2006 18:42:42 +0000 Subject: Pullup ticket 1664 - requested by salo security update for libextractor Revisions pulled up: - pkgsrc/devel/libextractor/Makefile 1.16, 1.17 - pkgsrc/devel/libextractor/PLIST 1.6 - pkgsrc/devel/libextractor/distinfo 1.13, 1.14 - pkgsrc/devel/libextractor/patches/patch-ab 1.4, 1.5 - pkgsrc/devel/libextractor/patches/patch-ac removed - pkgsrc/devel/libextractor/patches/patch-ad 1.6, 1.7 Module Name: pkgsrc Committed By: adam Date: Mon May 1 21:06:56 UTC 2006 Modified Files: pkgsrc/devel/libextractor: Makefile PLIST distinfo pkgsrc/devel/libextractor/patches: patch-ab patch-ad Removed Files: pkgsrc/devel/libextractor/patches: patch-ac Log Message: Changes 0.5.13: Added dictionaries for Finnish, French, Gaelic and Swedish (for printable extractors). Word history extraction works (wordleaker). exiv2 works. Added Python binding. libextractor becomes a GNU package. Thumbnails work. --- Module Name: pkgsrc Committed By: adam Date: Tue May 23 10:52:22 UTC 2006 Modified Files: pkgsrc/devel/libextractor: Makefile distinfo pkgsrc/devel/libextractor/patches: patch-ab patch-ad Log Message: Changes 0.5.14: * Bug fixes * MPEG2 support --- devel/libextractor/Makefile | 9 ++++++--- devel/libextractor/PLIST | 8 +++++++- devel/libextractor/distinfo | 13 ++++++------- devel/libextractor/patches/patch-ab | 6 +++--- devel/libextractor/patches/patch-ac | 12 ------------ devel/libextractor/patches/patch-ad | 6 +++--- 6 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 devel/libextractor/patches/patch-ac diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile index 0bdd9b254a2..c74c80f10f6 100644 --- a/devel/libextractor/Makefile +++ b/devel/libextractor/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.14 2006/03/05 22:19:31 tv Exp $ +# $NetBSD: Makefile,v 1.14.2.1 2006/05/23 18:42:42 ghen Exp $ -DISTNAME= libextractor-0.5.10 +DISTNAME= libextractor-0.5.14 CATEGORIES= devel MASTER_SITES= http://gnunet.org/libextractor/download/ -MAINTAINER= tech-pkg@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://gnunet.org/libextractor/ COMMENT= Metadata extractor for various file data types USE_LIBTOOL= yes +USE_LANGUAGES= c++ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes @@ -22,9 +23,11 @@ SHLIBTOOL_OVERRIDE+= ${WRKSRC}/libtool .include "../../audio/libvorbis/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libgsf/buildlink3.mk" .include "../../devel/libltdl/convenience.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../multimedia/libmpeg2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libextractor/PLIST b/devel/libextractor/PLIST index 2d4d0ebd11c..d1593ffba57 100644 --- a/devel/libextractor/PLIST +++ b/devel/libextractor/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2006/03/05 22:06:38 adam Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2006/05/23 18:42:42 ghen Exp $ bin/extract include/extractor.h lib/libextractor.la @@ -30,9 +30,13 @@ lib/libextractor/libextractor_printable_da.la lib/libextractor/libextractor_printable_de.la lib/libextractor/libextractor_printable_en.la lib/libextractor/libextractor_printable_es.la +lib/libextractor/libextractor_printable_fi.la +lib/libextractor/libextractor_printable_fr.la +lib/libextractor/libextractor_printable_ga.la lib/libextractor/libextractor_printable_it.la lib/libextractor/libextractor_printable_no.la lib/libextractor/libextractor_printable_pt.la +lib/libextractor/libextractor_printable_sv.la lib/libextractor/libextractor_ps.la lib/libextractor/libextractor_qt.la lib/libextractor/libextractor_real.la @@ -50,4 +54,6 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libextractor.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libextractor.mo ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libextractor.mo ${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/libextractor.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libextractor.mo +${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libextractor.mo @dirrm lib/libextractor diff --git a/devel/libextractor/distinfo b/devel/libextractor/distinfo index a016edd1d5c..3030209b6f6 100644 --- a/devel/libextractor/distinfo +++ b/devel/libextractor/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.12 2006/03/28 16:42:50 joerg Exp $ +$NetBSD: distinfo,v 1.12.2.1 2006/05/23 18:42:42 ghen Exp $ -SHA1 (libextractor-0.5.10.tar.gz) = 3c8cb7390176cb16afb92f0d68a185f69b8922a2 -RMD160 (libextractor-0.5.10.tar.gz) = f2bb561876c4ed6681df416c97e625f385e1f641 -Size (libextractor-0.5.10.tar.gz) = 6149272 bytes +SHA1 (libextractor-0.5.14.tar.gz) = bdd9b96d00ebc30281decb6fb5c5f097a643122d +RMD160 (libextractor-0.5.14.tar.gz) = 1c5a22650ca9270934ae7295c2670e7261b910c1 +Size (libextractor-0.5.14.tar.gz) = 7750318 bytes SHA1 (patch-aa) = f0923e6cba8e6bb327a7959a3d7679bb78a530b2 -SHA1 (patch-ab) = f8f12217898b1c8f68f7f2280f59b7dcabdfb9d2 -SHA1 (patch-ac) = 0eec20698da281f26ed6077fefb0f49d4e5e3cdf -SHA1 (patch-ad) = c2f06a76b373473584a27745a35f294bf2201f41 +SHA1 (patch-ab) = 1516691329cd367d2378ddda6e997f10ef09902f +SHA1 (patch-ad) = ece1cacb479e9c70d0aee4f87cc72b84b85de802 diff --git a/devel/libextractor/patches/patch-ab b/devel/libextractor/patches/patch-ab index b5bcdc0a2e4..ddeaea021e6 100644 --- a/devel/libextractor/patches/patch-ab +++ b/devel/libextractor/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2006/03/05 22:06:38 adam Exp $ +$NetBSD: patch-ab,v 1.3.2.1 2006/05/23 18:42:43 ghen Exp $ ---- src/main/extractor.c.orig 2006-02-12 04:03:13.000000000 +0100 +--- src/main/extractor.c.orig 2006-05-17 05:01:12.000000000 +0200 +++ src/main/extractor.c -@@ -186,7 +186,6 @@ libextractor_id3v24:\ +@@ -211,7 +211,6 @@ libextractor_id3v24:\ libextractor_mime:\ libextractor_tar:\ libextractor_dvi:\ diff --git a/devel/libextractor/patches/patch-ac b/devel/libextractor/patches/patch-ac deleted file mode 100644 index 8964ed6f28c..00000000000 --- a/devel/libextractor/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/03/05 22:06:38 adam Exp $ - ---- src/main/Makefile.in.orig 2006-02-19 02:41:28.000000000 +0100 -+++ src/main/Makefile.in -@@ -263,7 +263,6 @@ AM_CFLAGS = \ - extract_LDADD = \ - $(top_builddir)/src/main/libextractor.la - --@MINGW_FALSE@dlflag = -ldl - @HAVE_ZLIB_TRUE@zlib = -lz - @HAVE_BZ2_TRUE@bz2lib = -lbz2 - libextractor_la_LDFLAGS = \ diff --git a/devel/libextractor/patches/patch-ad b/devel/libextractor/patches/patch-ad index a554e32f9f5..9039db2bc28 100644 --- a/devel/libextractor/patches/patch-ad +++ b/devel/libextractor/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2006/03/28 16:42:50 joerg Exp $ +$NetBSD: patch-ad,v 1.5.2.1 2006/05/23 18:42:43 ghen Exp $ ---- src/plugins/exiv2/Makefile.in.orig 2006-03-28 16:17:07.000000000 +0000 +--- src/plugins/exiv2/Makefile.in.orig 2006-05-17 11:07:31.000000000 +0200 +++ src/plugins/exiv2/Makefile.in -@@ -275,11 +275,11 @@ libextractor_exiv2_la_LINK = \ +@@ -292,11 +292,11 @@ libextractor_exiv2_la_LINK = \ /bin/sh ../../../libtool --mode=link $(CXXLD) -o libextractor_exiv2.la libextractor_exiv2_la_LDFLAGS = \ -- cgit v1.2.3