Date: Thu, 4 Aug 2011 03:25:00 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/159497: Update port: x11-toolkits/efltk Message-ID: <20110804032500.d0a7e070.tkato432@yahoo.com> Resent-Message-ID: <201108031840.p73Iedtv078483@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159497
>Category: ports
>Synopsis: Update port: x11-toolkits/efltk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 03 18:40:39 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on 7-stable
- Fix pkg-plist if WITHOUT_MYSQL is enabled
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-toolkits/efltk/Makefile x11-toolkits/efltk/Makefile
--- /usr/ports/x11-toolkits/efltk/Makefile 2011-03-20 03:04:48.000000000 +0900
+++ x11-toolkits/efltk/Makefile 2011-07-25 20:41:27.000000000 +0900
@@ -21,27 +21,26 @@
ONLY_FOR_ARCHS= i386
-.if defined(WITHOUT_MYSQL)
-CONFIGURE_ARGS+= --disable-mysql
-.else
-USE_MYSQL= yes
-.endif
-
-USE_GMAKE= yes
-USE_GETTEXT= yes
+USE_XORG= x11 xext
USE_AUTOTOOLS= autoconf213
+USE_GETTEXT= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
- DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
-MAKE_ENV+= LD_LIBRARY_PATH="${WRKSRC}/lib"
-
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" DEBUGFLAG="${CFLAGS}"
+MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib"
USE_LDCONFIG= yes
-USE_XORG= x11 xext
+
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800069
-BROKEN= does not build
+.if defined(WITHOUT_MYSQL)
+CONFIGURE_ARGS+=--disable-mysql
+PLIST_SUB+= MYSQL="@comment "
+.else
+USE_MYSQL= yes
+PLIST_SUB+= MYSQL=""
.endif
.include <bsd.port.post.mk>
diff -urN /usr/ports/x11-toolkits/efltk/files/patch-src-filename_list.cpp x11-toolkits/efltk/files/patch-src-filename_list.cpp
--- /usr/ports/x11-toolkits/efltk/files/patch-src-filename_list.cpp 2011-03-04 22:56:59.000000000 +0900
+++ x11-toolkits/efltk/files/patch-src-filename_list.cpp 2011-07-25 20:29:09.000000000 +0900
@@ -1,11 +1,22 @@
---- src/core/filename_list.cpp 2010-11-12 00:31:17.000000000 +0100
-+++ src/core/filename_list.cpp 2009-04-22 13:51:38.000000000 +0200
-@@ -59,7 +59,7 @@
+--- src/core/filename_list.cpp.orig 2009-04-22 20:51:38.000000000 +0900
++++ src/core/filename_list.cpp 2011-07-25 20:26:24.000000000 +0900
+@@ -34,6 +34,7 @@
+
+ #include <efltk/filename.h>
+ #include <efltk/Fl_String.h>
++#include <sys/param.h>
+
+ #if !HAVE_SCANDIR
+ extern int fl_scandir(const char *dir, dirent ***namelist,
+@@ -59,7 +60,11 @@
// The vast majority of Unix systems want the sort function to have this
// prototype, most likely so that it can be passed to qsort without any
// changes:
-- return scandir(dir, list, 0, (int(*)(const void*,const void*))sort);
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 900006 || (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || (__FreeBSD_version >= 730000 && __FreeBSD_version < 800000))
+ return scandir(dir, list, 0, (int(*)(const dirent **, const dirent **))sort);
++#else
+ return scandir(dir, list, 0, (int(*)(const void*,const void*))sort);
++#endif
#else
// This version is when we define our own scandir (WIN32 and perhaps
// some Unix systems) and apparently on Irix:
diff -urN /usr/ports/x11-toolkits/efltk/pkg-plist x11-toolkits/efltk/pkg-plist
--- /usr/ports/x11-toolkits/efltk/pkg-plist 2007-12-18 03:55:34.000000000 +0900
+++ x11-toolkits/efltk/pkg-plist 2011-07-25 20:32:44.000000000 +0900
@@ -215,8 +215,8 @@
lib/libefltk_gl.so.2
lib/libefltk_images.so
lib/libefltk_images.so.2
-lib/libefltk_mysql.so
-lib/libefltk_mysql.so.2
+%%MYSQL%%lib/libefltk_mysql.so
+%%MYSQL%%lib/libefltk_mysql.so.2
lib/libefltk_net.so
lib/libefltk_net.so.2
lib/libefltk_xml.so
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110804032500.d0a7e070.tkato432>