aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--accessibility/atk/Makefile7
-rw-r--r--accessibility/atk/distinfo2
-rw-r--r--accessibility/atk/pkg-plist5
-rw-r--r--devel/Makefile1
-rw-r--r--devel/atk/Makefile7
-rw-r--r--devel/atk/distinfo2
-rw-r--r--devel/atk/pkg-plist5
-rw-r--r--devel/pkg-config/Makefile10
-rw-r--r--devel/pkg-config/distinfo2
-rw-r--r--devel/pkgconfig/Makefile10
-rw-r--r--devel/pkgconfig/distinfo2
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/gtk20/Makefile12
-rw-r--r--x11-toolkits/gtk20/distinfo2
-rw-r--r--x11-toolkits/gtk20/files/patch-ae6
-rw-r--r--x11-toolkits/gtk20/pkg-plist48
-rw-r--r--x11-toolkits/gtk30/Makefile12
-rw-r--r--x11-toolkits/gtk30/distinfo2
-rw-r--r--x11-toolkits/gtk30/files/patch-ae6
-rw-r--r--x11-toolkits/gtk30/pkg-plist48
-rw-r--r--x11-toolkits/pango/Makefile15
-rw-r--r--x11-toolkits/pango/distinfo2
-rw-r--r--x11-toolkits/pango/files/patch-ab45
-rw-r--r--x11-toolkits/pango/files/patch-ac16
-rw-r--r--x11-toolkits/pango/pkg-plist87
25 files changed, 174 insertions, 181 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 4611d35daa07..e78617d75e14 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= atk
-PORTVERSION= 0.12
+PORTVERSION= 1.0.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,11 +19,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13
+LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20
USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 7fce910d6ab3..7cba67445ced 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-0.12.tar.bz2) = 09509179928e4558d2a71c954cf002ba
+MD5 (gnome2/atk-1.0.0.tar.bz2) = 885f39a89bbc96b587da893f61943a21
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index cbd91d8c5ddc..a657b8a6397a 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -23,8 +23,9 @@ include/atk-1.0/atk/atktable.h
include/atk-1.0/atk/atktext.h
include/atk-1.0/atk/atkutil.h
include/atk-1.0/atk/atkvalue.h
-lib/libatk.so
-lib/libatk.so.12
+lib/libatk-1.0.a
+lib/libatk-1.0.so
+lib/libatk-1.0.so.0
libdata/pkgconfig/atk.pc
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/devel/Makefile b/devel/Makefile
index 6439308683ad..93b30b7d8aad 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -176,6 +176,7 @@
SUBDIR += glg
SUBDIR += glib12
SUBDIR += glib13
+ SUBDIR += glib20
SUBDIR += global
SUBDIR += glui
SUBDIR += gmake
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 4611d35daa07..e78617d75e14 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= atk
-PORTVERSION= 0.12
+PORTVERSION= 1.0.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,11 +19,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13
+LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20
USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index 7fce910d6ab3..7cba67445ced 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-0.12.tar.bz2) = 09509179928e4558d2a71c954cf002ba
+MD5 (gnome2/atk-1.0.0.tar.bz2) = 885f39a89bbc96b587da893f61943a21
diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist
index cbd91d8c5ddc..a657b8a6397a 100644
--- a/devel/atk/pkg-plist
+++ b/devel/atk/pkg-plist
@@ -23,8 +23,9 @@ include/atk-1.0/atk/atktable.h
include/atk-1.0/atk/atktext.h
include/atk-1.0/atk/atkutil.h
include/atk-1.0/atk/atkvalue.h
-lib/libatk.so
-lib/libatk.so.12
+lib/libatk-1.0.a
+lib/libatk-1.0.so
+lib/libatk-1.0.so.0
libdata/pkgconfig/atk.pc
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index d6f96154ef89..13b7c5a5a734 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME= pkgconfig
-PORTVERSION= 0.10.0
+PORTVERSION= 0.11.0
CATEGORIES= devel
-MASTER_SITES= http://www.marcuscom.com/downloads/ \
- http://www.freedesktop.org/software/pkgconfig/releases/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+USE_BZIP2= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFILES= glib-1.2.8/configure
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 22c628d4c91b..36afa873c8d2 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1 +1 @@
-MD5 (pkgconfig-0.10.0.tar.gz) = 8cf9270cee9a8d85ef977f9ac6fec927
+MD5 (gnome2/pkgconfig-0.11.0.tar.bz2) = 8ff14b6109c3062195e3539de84487e0
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index d6f96154ef89..13b7c5a5a734 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME= pkgconfig
-PORTVERSION= 0.10.0
+PORTVERSION= 0.11.0
CATEGORIES= devel
-MASTER_SITES= http://www.marcuscom.com/downloads/ \
- http://www.freedesktop.org/software/pkgconfig/releases/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta2
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+USE_BZIP2= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFILES= glib-1.2.8/configure
diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo
index 22c628d4c91b..36afa873c8d2 100644
--- a/devel/pkgconfig/distinfo
+++ b/devel/pkgconfig/distinfo
@@ -1 +1 @@
-MD5 (pkgconfig-0.10.0.tar.gz) = 8cf9270cee9a8d85ef977f9ac6fec927
+MD5 (gnome2/pkgconfig-0.11.0.tar.bz2) = 8ff14b6109c3062195e3539de84487e0
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index c4a67751ef2e..710557d0a44f 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -38,6 +38,7 @@
SUBDIR += gtk12
SUBDIR += gtk12-apireference
SUBDIR += gtk13
+ SUBDIR += gtk20
SUBDIR += gtkada
SUBDIR += gtkbe
SUBDIR += gtkextra
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f8ea40ea1fe4..33b5623741da 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gtk
-PORTVERSION= 1.3.14
+PORTVERSION= 2.0.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,8 +20,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= atk.12:${PORTSDIR}/devel/atk \
- pango.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/devel/atk \
+ pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -33,7 +33,9 @@ USE_XPM= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ARGS= --enable-static
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
+ -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
PLIST_SUB= GTK_VERSION="${PORTVERSION}"
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 3cec335d7c87..49a25add2423 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-1.3.14.tar.bz2) = 2f1408386e6d79ea55d2a61494867312
+MD5 (gnome2/gtk+-2.0.0.tar.bz2) = 3afdfc83cf2099af1811e261a82c7ccb
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index eeb3f3e7be19..0bb2e2fb8dfe 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,9 +1,9 @@
$FreeBSD$
---- configure.orig Wed Jan 30 05:58:27 2002
-+++ configure Tue Feb 12 11:19:52 2002
-@@ -9783,7 +9783,7 @@
+--- configure.orig Fri Mar 8 19:22:14 2002
++++ configure Mon Mar 11 12:03:39 2002
+@@ -9788,7 +9788,7 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
CATOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 790e5444371b..e2696d2d1382 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -193,28 +193,28 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-am-et.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-hangul.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ti-er.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ti-et.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
-lib/libgdk-x11-1.3.a
-lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.14
-lib/libgdk_pixbuf-1.3.a
-lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.14
-lib/libgdk_pixbuf_xlib-1.3.a
-lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.14
-lib/libgtk-x11-1.3.a
-lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.14
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/libgdk-x11-2.0.a
+lib/libgdk-x11-2.0.so
+lib/libgdk-x11-2.0.so.0
+lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.so
+lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.so
+lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgtk-x11-2.0.a
+lib/libgtk-x11-2.0.so
+lib/libgtk-x11-2.0.so.0
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -225,6 +225,7 @@ share/aclocal/gtk-2.0.m4
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20.mo
share/locale/da/LC_MESSAGES/gtk20.mo
share/locale/de/LC_MESSAGES/gtk20.mo
share/locale/el/LC_MESSAGES/gtk20.mo
@@ -274,9 +275,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
@dirrm share/themes/Default
-@dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
-@dirrm lib/gtk-2.0/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%
@dirrm lib/gtk-2.0
@dirrm include/gtk-2.0/gtk
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f8ea40ea1fe4..33b5623741da 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gtk
-PORTVERSION= 1.3.14
+PORTVERSION= 2.0.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,8 +20,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= atk.12:${PORTSDIR}/devel/atk \
- pango.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/devel/atk \
+ pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -33,7 +33,9 @@ USE_XPM= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ARGS= --enable-static
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
+ -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
PLIST_SUB= GTK_VERSION="${PORTVERSION}"
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 3cec335d7c87..49a25add2423 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-1.3.14.tar.bz2) = 2f1408386e6d79ea55d2a61494867312
+MD5 (gnome2/gtk+-2.0.0.tar.bz2) = 3afdfc83cf2099af1811e261a82c7ccb
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index eeb3f3e7be19..0bb2e2fb8dfe 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,9 +1,9 @@
$FreeBSD$
---- configure.orig Wed Jan 30 05:58:27 2002
-+++ configure Tue Feb 12 11:19:52 2002
-@@ -9783,7 +9783,7 @@
+--- configure.orig Fri Mar 8 19:22:14 2002
++++ configure Mon Mar 11 12:03:39 2002
+@@ -9788,7 +9788,7 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
CATOBJEXT=.mo
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 790e5444371b..e2696d2d1382 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -193,28 +193,28 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-am-et.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-hangul.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ti-er.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ti-et.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
-lib/libgdk-x11-1.3.a
-lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.14
-lib/libgdk_pixbuf-1.3.a
-lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.14
-lib/libgdk_pixbuf_xlib-1.3.a
-lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.14
-lib/libgtk-x11-1.3.a
-lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.14
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/libgdk-x11-2.0.a
+lib/libgdk-x11-2.0.so
+lib/libgdk-x11-2.0.so.0
+lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.so
+lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.so
+lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgtk-x11-2.0.a
+lib/libgtk-x11-2.0.so
+lib/libgtk-x11-2.0.so.0
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -225,6 +225,7 @@ share/aclocal/gtk-2.0.m4
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20.mo
share/locale/da/LC_MESSAGES/gtk20.mo
share/locale/de/LC_MESSAGES/gtk20.mo
share/locale/el/LC_MESSAGES/gtk20.mo
@@ -274,9 +275,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
@dirrm share/themes/Default
-@dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
-@dirrm lib/gtk-2.0/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%
@dirrm lib/gtk-2.0
@dirrm include/gtk-2.0/gtk
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index e0efc0c27118..310d2e842680 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= pango
-PORTVERSION= 0.25
+PORTVERSION= 1.0.0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
ftp://ftp.gtk.org/pub/gtk/v1.3/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
http://www.ameth.org/gimp/gtk/v1.3/
@@ -17,16 +17,18 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
-LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13 \
- freetype.8:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \
+ freetype.9:${PORTSDIR}/print/freetype2 \
intl.1:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-qt=no
-
+CONFIGURE_ARGS= --with-qt=no \
+ --with-html-dir=${PREFIX}/share/doc \
+ --enable-static
# Hmm.. tough one. Found this one when I had graphics/hdf installed
# (which installs glist.h) which is picked up before the glib-2.0
# stuff, with Bad Results[tm]
@@ -37,6 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+PLIST_SUB= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index b2098df5b877..d3175c7bc0d4 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pango-0.25.tar.bz2) = b1da9f0b95a7d2bfd481db0278739e18
+MD5 (gnome2/pango-1.0.0.tar.bz2) = bfb7b217600fc9304889805d40dd5bd3
diff --git a/x11-toolkits/pango/files/patch-ab b/x11-toolkits/pango/files/patch-ab
deleted file mode 100644
index 2d2f8f2a8eb3..000000000000
--- a/x11-toolkits/pango/files/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- pango/Makefile.in.orig Fri Jan 18 10:25:47 2002
-+++ pango/Makefile.in Fri Jan 18 10:28:08 2002
-@@ -200,10 +200,10 @@
- # down at which point we'll either use the GTK+ versioning
- # scheme or the standard libtool scheme.
- #
--libpango_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pango_export_symbols)
-+libpango_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) $(no_undefined) $(pango_export_symbols)
- @HAVE_FRIBIDI_FALSE@libpango_la_LIBADD = @HAVE_FRIBIDI_FALSE@mini-fribidi/libmini-fribidi.la
-
--libpangox_la_LDFLAGS = -release $(VERSION)
-+libpangox_la_LDFLAGS = -version-info $(VERSION:S/./:/)
- libpangox_la_LIBADD = libpango.la $(INCLUDED_X_MODULES) $(X_LIBS)
- libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la
-
-@@ -216,7 +216,7 @@
- module-defs-win32.c
-
-
--libpangowin32_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangowin32_export_symbols)
-+libpangowin32_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) $(no_undefined) $(pangowin32_export_symbols)
- libpangowin32_la_LIBADD = libpango.la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS)
- libpangowin32_la_DEPENDENCIES = libpango.la
-
-@@ -228,7 +228,7 @@
-
-
- libpangoxft_la_LIBADD = opentype/libpango-ot.la libpango.la $(INCLUDED_XFT_MODULES) $(XFT_LIBS)
--libpangoxft_la_LDFLAGS = -release $(VERSION)
-+libpangoxft_la_LDFLAGS = -version-info $(VERSION:S/./:/)
- libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango.la
-
- libpangoft2_la_SOURCES = \
-@@ -240,7 +240,7 @@
-
-
- libpangoft2_la_LIBADD = $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) mini-xft/libmini-xft.la libpango.la
--libpangoft2_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
-+libpangoft2_la_LDFLAGS = -version-info $(VERSION:S/./:/) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
- libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la
-
- pangoincludedir = $(includedir)/pango-1.0/pango
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index 740dc9b2eb38..58f739a1e675 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,14 +1,14 @@
$FreeBSD$
---- Makefile.in.orig Wed Jul 18 15:25:57 2001
-+++ Makefile.in Wed Jul 18 15:26:20 2001
-@@ -101,7 +101,7 @@
- VERSION = @VERSION@
- XFT_LIBS = @XFT_LIBS@
+--- Makefile.in.orig Mon Mar 11 12:16:33 2002
++++ Makefile.in Mon Mar 11 12:24:58 2002
+@@ -116,7 +116,7 @@
+ YACC = @YACC@
+ ms_librarian = @ms_librarian@
-SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules examples tools tests
-
- EXTRA_DIST = pango.spec.in pango.pc.in pangox.pc.in pangoxft.pc.in pangoft2.pc.in pango-uninstalled.pc.in pangox-uninstalled.pc.in pangoxft-uninstalled.pc.in pangoft2-uninstalled.pc.in TODO.xml README.win32
++SUBDIRS = pango modules examples docs tools
+ EXTRA_DIST = \
+ pango.spec.in \
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 46b9f15db761..5bb930a9087d 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -23,41 +23,66 @@ include/pango-1.0/pango/pango.h
include/pango-1.0/pango/pangoft2.h
include/pango-1.0/pango/pangox.h
%%XFREE4:%%include/pango-1.0/pango/pangoxft.h
-lib/libpango.a
-lib/libpango.so
-lib/libpango.so.0
-lib/libpangoft2.a
-lib/libpangoft2.so
-lib/libpangoft2.so.0
-lib/libpangox.a
-lib/libpangox.so
-lib/libpangox.so.0
-%%XFREE4:%%lib/libpangoxft.a
-%%XFREE4:%%lib/libpangoxft.so
-%%XFREE4:%%lib/libpangoxft.so.0
-lib/pango/modules/pango-arabic-ft2.so
-lib/pango/modules/pango-arabic-x.so
-%%XFREE4:%%lib/pango/modules/pango-arabic-xft.so
-lib/pango/modules/pango-basic-ft2.so
-lib/pango/modules/pango-basic-x.so
-%%XFREE4:%%lib/pango/modules/pango-basic-xft.so
-lib/pango/modules/pango-bengali-x.so
-lib/pango/modules/pango-devanagari-x.so
-lib/pango/modules/pango-gujarati-x.so
-lib/pango/modules/pango-gurmukhi-x.so
-lib/pango/modules/pango-hangul-x.so
-lib/pango/modules/pango-hebrew-ft2.so
-lib/pango/modules/pango-hebrew-x.so
-%%XFREE4:%%lib/pango/modules/pango-hebrew-xft.so
-lib/pango/modules/pango-myanmar-x.so
-lib/pango/modules/pango-tamil-x.so
-%%XFREE4:%%lib/pango/modules/pango-tamil-xft.so
-lib/pango/modules/pango-thai-x.so
+lib/libpango-1.0.a
+lib/libpango-1.0.so
+lib/libpango-1.0.so.0
+lib/libpangoft2-1.0.a
+lib/libpangoft2-1.0.so
+lib/libpangoft2-1.0.so.0
+lib/libpangox-1.0.a
+lib/libpangox-1.0.so
+lib/libpangox-1.0.so.0
+%%XFREE4:%%lib/libpangoxft-1.0.a
+%%XFREE4:%%lib/libpangoxft-1.0.so
+%%XFREE4:%%lib/libpangoxft-1.0.so.0
+lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so
+lib/pango/%%VERSION%%/modules/pango-arabic-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
+lib/pango/%%VERSION%%/modules/pango-basic-ft2.so
+lib/pango/%%VERSION%%/modules/pango-basic-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-basic-xft.so
+lib/pango/%%VERSION%%/modules/pango-bengali-x.so
+lib/pango/%%VERSION%%/modules/pango-devanagari-x.so
+lib/pango/%%VERSION%%/modules/pango-gujarati-x.so
+lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so
+lib/pango/%%VERSION%%/modules/pango-hangul-x.so
+lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so
+lib/pango/%%VERSION%%/modules/pango-hebrew-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
+lib/pango/%%VERSION%%/modules/pango-myanmar-x.so
+lib/pango/%%VERSION%%/modules/pango-tamil-x.so
+%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-tamil-xft.so
+lib/pango/%%VERSION%%/modules/pango-thai-x.so
libdata/pkgconfig/pango.pc
libdata/pkgconfig/pangoft2.pc
libdata/pkgconfig/pangox.pc
%%XFREE4:%%libdata/pkgconfig/pangoxft.pc
-@dirrm lib/pango/modules
+share/doc/pango/index.html
+share/doc/pango/index.sgml
+share/doc/pango/layout.gif
+share/doc/pango/lowlevel.html
+share/doc/pango/pango-coverage-maps.html
+share/doc/pango/pango-engines.html
+share/doc/pango/pango-fonts.html
+share/doc/pango/pango-freetype-fonts-and-rendering.html
+share/doc/pango/pango-glyph-storage.html
+share/doc/pango/pango-indic-engine-support.html
+share/doc/pango/pango-layout-objects.html
+share/doc/pango/pango-modules.html
+share/doc/pango/pango-opentype-font-handling.html
+share/doc/pango/pango-tab-stops.html
+share/doc/pango/pango-text-attributes.html
+share/doc/pango/pango-text-processing.html
+share/doc/pango/pango-win32-fonts-and-rendering.html
+share/doc/pango/pango-x-fonts.html
+share/doc/pango/pango-x-rendering.html
+share/doc/pango/pango-xft-fonts-and-rendering.html
+share/doc/pango/pango.html
+share/doc/pango/pangomarkupformat.html
+share/doc/pango/rendering.html
+@dirrm share/doc/pango
+@dirrm lib/pango/%%VERSION%%/modules
+@dirrm lib/pango/%%VERSION%%
@dirrm lib/pango
@dirrm include/pango-1.0/pango
@dirrm include/pango-1.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:03:57 +0000