From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 16 03:40:18 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D065216A41C for ; Sat, 16 Jul 2005 03:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3141F43D48 for ; Sat, 16 Jul 2005 03:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6G3eI3M032268 for ; Sat, 16 Jul 2005 03:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6G3eIY8032264; Sat, 16 Jul 2005 03:40:18 GMT (envelope-from gnats) Resent-Date: Sat, 16 Jul 2005 03:40:18 GMT Resent-Message-Id: <200507160340.j6G3eIY8032264@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C209316A41C; Sat, 16 Jul 2005 03:36:46 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from mail.grupos.com.br (mail.grupos.com.br [200.203.183.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23C6043D46; Sat, 16 Jul 2005 03:36:45 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from corp.grupos.com.br (unknown [150.162.166.55]) by mail.grupos.com.br (Postfix) with ESMTP id E1BCD11E9D5; Sat, 16 Jul 2005 00:36:43 -0300 (BRT) Received: from corp.grupos.com.br (localhost [127.0.0.1]) by corp.grupos.com.br (Postfix) with ESMTP id 8BC7156AB; Sat, 16 Jul 2005 00:36:43 -0300 (BRT) Received: by corp.grupos.com.br (Postfix, from userid 0) id 6DDA05626; Sat, 16 Jul 2005 00:36:43 -0300 (BRT) Message-Id: <20050716033643.6DDA05626@corp.grupos.com.br> Date: Sat, 16 Jul 2005 00:36:43 -0300 (BRT) From: Marcus Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kevlo@FreeBSD.org Subject: ports/83539: Update port: textproc/libextractor fix build on 4.x pointed by pointhat X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2005 03:40:19 -0000 >Number: 83539 >Category: ports >Synopsis: Update port: textproc/libextractor fix build on 4.x pointed by pointhat >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jul 16 03:40:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Marcus Grando >Release: FreeBSD 4.11-STABLE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Jul 11 10:07:29 BRT 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386 >Description: - Fix build on 4.x pointed by pointhat. Add files: files/patch-src::include::plibc.h files/patch-src::main::Makefile.in Removed files: files/patch-aa >How-To-Repeat: >Fix: --- libextractor.patch begins here --- diff -ruN libextractor.orig/Makefile libextractor/Makefile --- libextractor.orig/Makefile Mon Jun 13 01:09:46 2005 +++ libextractor/Makefile Fri Jul 15 20:32:59 2005 @@ -17,12 +17,16 @@ USE_GNOME= glib20 USE_PYTHON= yes USE_LIBLTDL= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-ltdl-install -USE_REINPLACE= yes INSTALLS_SHLIB= yes MAN1= extract.1 MAN3= libextractor.3 + +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/src/plugins/Makefile.in + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/src/plugins/Makefile.am .include diff -ruN libextractor.orig/files/patch-aa libextractor/files/patch-aa --- libextractor.orig/files/patch-aa Wed May 25 10:36:28 2005 +++ libextractor/files/patch-aa Wed Dec 31 21:00:00 1969 @@ -1,11 +0,0 @@ ---- src/main/Makefile.in.orig Sun May 22 02:43:44 2005 -+++ src/main/Makefile.in Wed May 25 17:24:05 2005 -@@ -703,8 +703,6 @@ - - - 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: diff -ruN libextractor.orig/files/patch-src::include::plibc.h libextractor/files/patch-src::include::plibc.h --- libextractor.orig/files/patch-src::include::plibc.h Wed Dec 31 21:00:00 1969 +++ libextractor/files/patch-src::include::plibc.h Fri Jul 15 21:04:15 2005 @@ -0,0 +1,58 @@ +--- src/include/plibc.h.orig Thu May 19 16:27:06 2005 ++++ src/include/plibc.h Fri Jul 15 21:03:54 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 @@ + #define STRERROR(i) _win_strerror(i) + #define READLINK(p, b, s) _win_readlink(p, b, s) + #define LSTAT(p, b) _win_lstat(p, b) +- #define PRINTF(f, ...) _win_printf(f , __VA_ARGS__) +- #define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__) ++ #define PRINTF(f, ARGS...) _win_printf(f , ##ARGS) ++ #define FPRINTF(fil, fmt, ARGS...) _win_fprintf(fil, fmt, ##ARGS) + #define VPRINTF(f, a) _win_vprintf(f, a) + #define VFPRINTF(s, f, a) _win_vfprintf(s, f, a) + #define VSPRINTF(d, f, a) _win_vsprintf(d, f, a) + #define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a) +- #define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt, __VA_ARGS__) +- #define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__) ++ #define _REAL_SNPRINTF(str, size, fmt, ARGS...) _win_snprintf(str, size, fmt, ##ARGS) ++ #define SPRINTF(d, f, ARGS...) _win_sprintf(d, f, ##ARGS) + #define VSSCANF(s, f, a) _win_vsscanf(s, f, a) +- #define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__) ++ #define SSCANF(s, f, ARGS...) _win_sscanf(s, f, ##ARGS) + #define VFSCANF(s, f, a) _win_vfscanf(s, f, a) + #define VSCANF(f, a) _win_vscanf(f, a) +- #define SCANF(f, ...) _win_scanf(f, __VA_ARGS__) +- #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 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 -ruN libextractor.orig/files/patch-src::main::Makefile.in libextractor/files/patch-src::main::Makefile.in --- libextractor.orig/files/patch-src::main::Makefile.in Wed Dec 31 21:00:00 1969 +++ libextractor/files/patch-src::main::Makefile.in Fri Jul 15 21:05:03 2005 @@ -0,0 +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 @@ + + + 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: --- libextractor.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: