aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2010-09-27 18:40:06 +0800
committergahr <gahr@FreeBSD.org>2010-09-27 18:40:06 +0800
commit472776ddd961f57272d38afec52616a9f7d955db (patch)
tree52756ae85793d2662c526a41f194a36736057d07 /x11-toolkits
parentaf403e2904d02f3169097a97821487bb482c0c68 (diff)
downloadfreebsd-ports-gnome-472776ddd961f57272d38afec52616a9f7d955db.tar.gz
freebsd-ports-gnome-472776ddd961f57272d38afec52616a9f7d955db.tar.zst
freebsd-ports-gnome-472776ddd961f57272d38afec52616a9f7d955db.zip
- Update to 1.7.22
Announcement: http://sf.net/mailarchive/message.php?msg_name=20100925132949.77bd7d9e%40fox-toolkit.com
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/fox17/Makefile4
-rw-r--r--x11-toolkits/fox17/distinfo6
-rw-r--r--x11-toolkits/fox17/files/patch-lib_FXThread.cpp20
-rw-r--r--x11-toolkits/fox17/pkg-plist1
4 files changed, 16 insertions, 15 deletions
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 1132312a7fdf..94484ecf5704 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fox
-PORTVERSION= 1.7.21
+PORTVERSION= 1.7.22
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/
@@ -35,7 +35,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl=yes
-CPPFLAGS= -I${LOCALBASE}/include
+CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS= -L${LOCALBASE}/lib
MAN1= reswrap.1 shutterbug.1 adie.1 PathFinder.1 calculator.1 \
diff --git a/x11-toolkits/fox17/distinfo b/x11-toolkits/fox17/distinfo
index 1c610b7e62f1..2f79f143c83e 100644
--- a/x11-toolkits/fox17/distinfo
+++ b/x11-toolkits/fox17/distinfo
@@ -1,3 +1,3 @@
-MD5 (fox-1.7.21.tar.gz) = dd390cc87d653fe76ff925eed0561186
-SHA256 (fox-1.7.21.tar.gz) = f06558609f4c53231d750f99f76a9557af13c35689c69b9ccadeb57448c5dda9
-SIZE (fox-1.7.21.tar.gz) = 4901051
+MD5 (fox-1.7.22.tar.gz) = ab1fc871f15a23e710c3a8f4a87aeaa7
+SHA256 (fox-1.7.22.tar.gz) = dc974c45ad3dd6686e8bae827a4d2892a2ebd7711ba1111abf265716c51b7336
+SIZE (fox-1.7.22.tar.gz) = 4918966
diff --git a/x11-toolkits/fox17/files/patch-lib_FXThread.cpp b/x11-toolkits/fox17/files/patch-lib_FXThread.cpp
index 8365f7fab434..ba069d1ea744 100644
--- a/x11-toolkits/fox17/files/patch-lib_FXThread.cpp
+++ b/x11-toolkits/fox17/files/patch-lib_FXThread.cpp
@@ -1,11 +1,11 @@
---- lib/FXThread.cpp.orig 2010-08-23 13:21:01.000000000 +0000
-+++ lib/FXThread.cpp 2010-08-23 13:21:20.000000000 +0000
-@@ -1182,7 +1182,7 @@
+--- lib/FXThread.cpp.orig 2010-09-27 08:48:52.000000000 +0000
++++ lib/FXThread.cpp 2010-09-27 08:49:43.000000000 +0000
+@@ -582,7 +582,7 @@
+ InitializeCriticalSection(((RWLOCK*)data)->mutex);
+ InitializeCriticalSection(((RWLOCK*)data)->access);
+ ((RWLOCK*)data)->readers=0;
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ // If this fails on your machine, determine what value
+ // of sizeof(pthread_rwlock_t) is supposed to be on your
// machine and mail it to: jeroen@fox-toolkit.com!!
- //FXTRACE((150,"sizeof(pthread_rwlock_t)=%d\n",sizeof(pthread_rwlock_t)));
- FXASSERT(sizeof(data)>=sizeof(pthread_rwlock_t));
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- pthread_rwlock_init((pthread_rwlock_t*)data,NULL);
- #else
- pthread_rwlockattr_t rwlockatt;
diff --git a/x11-toolkits/fox17/pkg-plist b/x11-toolkits/fox17/pkg-plist
index af7c9c170a84..53f4b127d339 100644
--- a/x11-toolkits/fox17/pkg-plist
+++ b/x11-toolkits/fox17/pkg-plist
@@ -321,6 +321,7 @@ include/fox-%%MAJORVER%%/chart/chartdefs.h
include/fox-%%MAJORVER%%/fx.h
include/fox-%%MAJORVER%%/fx3d.h
include/fox-%%MAJORVER%%/fxascii.h
+include/fox-%%MAJORVER%%/fxcpuid.h
include/fox-%%MAJORVER%%/fxdefs.h
include/fox-%%MAJORVER%%/fxkeys.h
include/fox-%%MAJORVER%%/fxunicode.h