summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk30
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-05-03 07:07:01 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-05-03 07:07:01 +0000
commitcae437add6ce7642bb119e3dfc8d5ba48a0cda34 (patch)
tree62dac380a905afc661172b427e3adb126cb75026 /x11-toolkits/gtk30
parentDisable thread support by default. This was interfering with ports (diff)
Link executables with -pthread so that they can work with threaded libraries
like libgthread.
Notes
Notes: svn path=/head/; revision=80039
Diffstat (limited to 'x11-toolkits/gtk30')
-rw-r--r--x11-toolkits/gtk30/Makefile1
-rw-r--r--x11-toolkits/gtk30/files/patch-ag14
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in13
3 files changed, 25 insertions, 3 deletions
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 8385d8441535..68019d86dfc8 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
ftp://ftp.gtk.org/pub/gtk/v2.0/ \
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index b0be157797ed..c4879a292522 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002
-+++ gtk/Makefile.in Thu Dec 12 12:08:43 2002
-@@ -183,7 +183,7 @@
+--- gtk/Makefile.in.orig Sat May 3 02:43:20 2003
++++ gtk/Makefile.in Sat May 3 02:46:30 2003
+@@ -175,7 +175,7 @@
-DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
@@ -9,3 +9,11 @@
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
-DGTK_HOST=\"@host@\" \
+@@ -651,6 +651,7 @@
+ TEST_DEPS = $(DEPS) gtk.immodules
+
+ LDADDS = @STRIP_BEGIN@ \
++ $(GLIB_LIBS) \
+ $(gtktargetlib) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gdk/$(gdktargetlib) \
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
new file mode 100644
index 000000000000..fa3e1270f1b2
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,13 @@
+--- gdk-pixbuf/Makefile.in.orig Sat May 3 02:51:31 2003
++++ gdk-pixbuf/Makefile.in Sat May 3 02:51:59 2003
+@@ -384,7 +384,9 @@
+
+
+ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
++LDADDS = \
++ $(GLIB_LIBS) \
++ libgdk_pixbuf-$(GTK_API_VERSION).la
+
+ noinst_PROGRAMS = test-gdk-pixbuf
+ test_gdk_pixbuf_LDADD = $(LDADDS)