ports/88074: Update port: textproc/libextractor to 0.5.6a

Thu Oct 27 07:30:20 UTC 2005

>Number:         88074
>Category:       ports
>Synopsis:       Update port: textproc/libextractor to 0.5.6a
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 27 07:30:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 6.0-RC1 amd64
>Organization:
DataMax
>Environment:

>Description:

Update libextractor from 0.5.0 to 0.5.6a:
* add ${MASTER_SITE_GNU} to the list of master sites
* add `check' target to aid with testing
* adapt files/patch-src::include::plibc.h to the new source
* remove old and add new files/patch-src::main::Makefile.in

This update is necessary for the forthcoming update of net/gnunet

>How-To-Repeat:

>Fix:

--- libextractor_0.5.0-0.5.6a.diff begins here ---
diff -urN --exclude=CVS --exclude=README.html libextractor.orig/Makefile libextractor/Makefile
--- libextractor.orig/Makefile	Mon Oct 10 15:50:40 2005
+++ libextractor/Makefile	Thu Oct 27 09:21:37 2005
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	libextractor
-PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.5.6a
 CATEGORIES=	textproc
-MASTER_SITES=	http://gnunet.org/libextractor/download/
+MASTER_SITES=	http://gnunet.org/libextractor/download/ \
+		${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kevlo at FreeBSD.org
 COMMENT=	Library for keyword extraction
 
-USE_BZIP2=	yes
 USE_GNOME=	glib20
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
@@ -39,6 +39,9 @@
 		${WRKSRC}/src/plugins/Makefile.*
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
+
+check: build
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
 .include <bsd.port.pre.mk>
 
diff -urN --exclude=CVS --exclude=README.html libextractor.orig/distinfo libextractor/distinfo
--- libextractor.orig/distinfo	Wed May 25 16:36:28 2005
+++ libextractor/distinfo	Wed Oct 26 18:49:27 2005
@@ -1,2 +1,2 @@
-MD5 (libextractor-0.5.0.tar.bz2) = b7c1288a63a08c35ba8ba9ec7df9c2ae
-SIZE (libextractor-0.5.0.tar.bz2) = 6303024
+MD5 (libextractor-0.5.6a.tar.gz) = 1e8022f10d58cc9f83ca3700b6645263
+SIZE (libextractor-0.5.6a.tar.gz) = 6115101
diff -urN --exclude=CVS --exclude=README.html libextractor.orig/files/patch-src::include::plibc.h libextractor/files/patch-src::include::plibc.h
--- libextractor.orig/files/patch-src::include::plibc.h	Mon Oct 10 15:50:40 2005
+++ libextractor/files/patch-src::include::plibc.h	Wed Oct 26 19:05:55 2005
@@ -1,34 +1,6 @@
---- src/include/plibc.h.orig	Tue Oct  4 23:37:40 2005
-+++ src/include/plibc.h	Tue Oct  4 23:41:22 2005
-@@ -451,20 +451,20 @@
-  #define STRERROR(i) strerror(i)
-  #define READLINK(p, b, s) readlink(p, b, s)
-  #define LSTAT(p, b) lstat(p, b)
-- #define PRINTF(f, ...) printf(f , __VA_ARGS__)
-- #define FPRINTF(fil, fmt, ...) fprintf(fil, fmt, __VA_ARGS__)
-+ #define PRINTF(f, ARGS...) printf(f , ##ARGS)
-+ #define FPRINTF(fil, fmt, ARGS...) fprintf(fil, fmt, ##ARGS)
-  #define VPRINTF(f, a) vprintf(f, a)
-  #define VFPRINTF(s, f, a) vfprintf(s, f, a)
-  #define VSPRINTF(d, f, a) vsprintf(d, f, a)
-  #define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)
-- #define _REAL_SNPRINTF(str, size, fmt, ...) snprintf(str, size, fmt, __VA_ARGS__)
-- #define SPRINTF(d, f, ...) sprintf(d, f, __VA_ARGS__)
-+ #define _REAL_SNPRINTF(str, size, fmt, ARGS...) snprintf(str, size, fmt, ##ARGS)
-+ #define SPRINTF(d, f, ARGS...) sprintf(d, f, ##ARGS)
-  #define VSSCANF(s, f, a) vsscanf(s, f, a)
-- #define SSCANF(s, f, ...) sscanf(s, f, __VA_ARGS__)
-+ #define SSCANF(s, f, ARGS...) sscanf(s, f, ##ARGS)
-  #define VFSCANF(s, f, a) vfscanf(s, f, a)
-  #define VSCANF(f, a) vscanf(f, a)
-- #define SCANF(f, ...) scanf(f, __VA_ARGS__)
-- #define FSCANF(s, f, ...) fscanf(s, f, __VA_ARGS__)
-+ #define SCANF(f, ARGS...) scanf(f, ##ARGS)
-+ #define FSCANF(s, f, ARGS...) fscanf(s, f, ##ARGS)
-  #define ACCEPT(s, a, l) accept(s, a, l)
-  #define BIND(s, n, l) bind(s, n, l)
-  #define CONNECT(s, n, l) connect(s, n, l)
-@@ -515,20 +515,20 @@
+--- src/include/plibc.h.orig	Wed Oct 26 18:55:22 2005
++++ src/include/plibc.h	Wed Oct 26 19:04:33 2005
+@@ -506,20 +506,20 @@
   #define STRERROR(i) _win_strerror(i)
   #define READLINK(p, b, s) _win_readlink(p, b, s)
   #define LSTAT(p, b) _win_lstat(p, b)
@@ -53,6 +25,6 @@
 - #define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__)
 + #define SCANF(f, ARGS...) _win_scanf(f, ##ARGS)
 + #define FSCANF(s, f, ARGS...) _win_fscanf(s, f, ##ARGS)
+  #define WAITPID(p, s, o) _win_waitpid(p, s, o)
   #define ACCEPT(s, a, l) _win_accept(s, a, l)
   #define BIND(s, n, l) _win_bind(s, n, l)
-  #define CONNECT(s, n, l) _win_connect(s, n, l)
diff -urN --exclude=CVS --exclude=README.html libextractor.orig/files/patch-src::main::Makefile.in libextractor/files/patch-src::main::Makefile.in
--- libextractor.orig/files/patch-src::main::Makefile.in	Wed Jul 20 07:16:30 2005
+++ libextractor/files/patch-src::main::Makefile.in	Wed Oct 26 19:20:04 2005
@@ -1,11 +1,11 @@
---- src/main/Makefile.in.orig	Sat May 21 15:43:44 2005
-+++ src/main/Makefile.in	Fri Jul 15 21:04:42 2005
-@@ -703,8 +703,6 @@
+--- src/main/Makefile.in.orig	Wed Oct 26 19:19:12 2005
++++ src/main/Makefile.in	Wed Oct 26 19:19:28 2005
+@@ -263,7 +263,7 @@
+ extract_LDADD = \
+   $(top_builddir)/src/main/libextractor.la 
  
+- at MINGW_FALSE@dlflag = -ldl
++ at MINGW_FALSE@dlflag =
  
- install-exec-local:
--	python libextractor_python_setup.py $(libdir) build
--	python libextractor_python_setup.py $(libdir) install --prefix=$(PYTHON_PREFIX)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+ #if HAVE_ZLIB
+ zlib = -lz
diff -urN --exclude=CVS --exclude=README.html libextractor.orig/pkg-plist libextractor/pkg-plist
--- libextractor.orig/pkg-plist	Mon Oct 10 15:50:40 2005
+++ libextractor/pkg-plist	Thu Oct 27 09:25:49 2005
@@ -2,11 +2,12 @@
 include/extractor.h
 lib/libextractor.a
 lib/libextractor.so
-lib/libextractor.so.1
+lib/libextractor.so.2
 lib/libextractor/libextractor_asf.so
 lib/libextractor/libextractor_deb.so
 lib/libextractor/libextractor_dvi.so
 lib/libextractor/libextractor_elf.so
+lib/libextractor/libextractor_exiv2.so
 lib/libextractor/libextractor_filename.so
 lib/libextractor/libextractor_gif.so
 lib/libextractor/libextractor_hash_md5.so
@@ -24,7 +25,6 @@
 lib/libextractor/libextractor_mpeg.so
 %%VORBIS:%%lib/libextractor/libextractor_ogg.so
 lib/libextractor/libextractor_oo.so
-lib/libextractor/libextractor_pdf.a
 lib/libextractor/libextractor_pdf.so
 lib/libextractor/libextractor_png.so
 lib/libextractor/libextractor_printable_da.so
@@ -33,6 +33,7 @@
 lib/libextractor/libextractor_printable_es.so
 lib/libextractor/libextractor_printable_it.so
 lib/libextractor/libextractor_printable_no.so
+lib/libextractor/libextractor_printable_pt.so
 lib/libextractor/libextractor_ps.so
 lib/libextractor/libextractor_qt.so
 lib/libextractor/libextractor_real.so
--- libextractor_0.5.0-0.5.6a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

