diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-10-24 08:23:29 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-10-24 08:23:29 +0000 |
| commit | e559f704c0c9bf19fd0a2a5c5d07055bed25d357 (patch) | |
| tree | fcc9ba9ee03f53da438feb077807e6039040e150 | |
| parent | 9639101906011cbf398e91f8e5c05cc952237043 (diff) | |
| download | ports-e559f704c0c9bf19fd0a2a5c5d07055bed25d357.tar.gz ports-e559f704c0c9bf19fd0a2a5c5d07055bed25d357.zip | |
Notes
28 files changed, 329 insertions, 370 deletions
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile index 7dd55b814ef2..eaa5328f3b04 100644 --- a/devel/glib13/Makefile +++ b/devel/glib13/Makefile @@ -6,7 +6,7 @@ # PORTNAME= glib -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -38,4 +38,7 @@ pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' +post-install: + ${INSTALL_DATA} ${WRKSRC}/glibconfig.h ${PREFIX}/include/glib-2.0 + .include <bsd.port.mk> diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo index 07b4a299dd12..dfd3010393ae 100644 --- a/devel/glib13/distinfo +++ b/devel/glib13/distinfo @@ -1 +1 @@ -MD5 (glib-1.3.6.tar.gz) = fe116d632b3b628d8114ac5a56855722 +MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0 diff --git a/devel/glib13/files/patch-ae b/devel/glib13/files/patch-ae index e05693d07459..3b0ff24656f8 100644 --- a/devel/glib13/files/patch-ae +++ b/devel/glib13/files/patch-ae @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Wed Jun 13 19:39:30 2001 -+++ configure Wed Aug 1 19:33:18 2001 -@@ -10018,6 +10018,12 @@ +--- configure.orig Tue Sep 25 18:36:39 2001 ++++ configure Wed Oct 24 10:00:12 2001 +@@ -9924,6 +9924,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; @@ -16,7 +16,7 @@ $FreeBSD$ esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -10488,8 +10494,8 @@ +@@ -10472,8 +10478,8 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -27,7 +27,7 @@ $FreeBSD$ # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support # -mthreads flag. -@@ -10569,13 +10575,13 @@ +@@ -10553,13 +10559,13 @@ fi ;; *) @@ -44,22 +44,22 @@ $FreeBSD$ fi if test x"$have_threads" = xposix; then defattr=0 -@@ -11114,6 +11120,7 @@ - if test "$cross_compiling" = yes; then +@@ -11058,6 +11064,7 @@ + if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else +# LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 11119 "configure" + #line 11063 "configure" #include "confdefs.h" -@@ -11481,14 +11488,14 @@ +@@ -11516,14 +11523,14 @@ # # Check for libiconv # - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:11486: checking for libiconv_open in -liconv" >&5 +-echo "configure:11521: checking for libiconv_open in -liconv" >&5 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:11486: checking for libiconv_open in -lgiconv" >&5 ++echo "configure:11521: checking for libiconv_open in -lgiconv" >&5 ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -68,9 +68,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 11494 "configure" + #line 11529 "configure" #include "confdefs.h" -@@ -11528,7 +11535,7 @@ +@@ -11563,7 +11570,7 @@ fi if test "x$with_libiconv" = "xyes" ; then diff --git a/devel/glib13/files/patch-ag b/devel/glib13/files/patch-ag index 6303062bd037..7fdde4ddb14b 100644 --- a/devel/glib13/files/patch-ag +++ b/devel/glib13/files/patch-ag @@ -1,23 +1,23 @@ $FreeBSD$ ---- Makefile.in.orig Wed Jul 18 15:45:33 2001 -+++ Makefile.in Wed Jul 18 15:47:24 2001 -@@ -136,7 +136,7 @@ +--- Makefile.in.orig Wed Oct 24 10:00:39 2001 ++++ Makefile.in Wed Oct 24 10:01:07 2001 +@@ -147,7 +147,7 @@ AUTOMAKE_OPTIONS = 1.4 --SUBDIRS = . m4macros gobject gmodule gthread docs tests build -+SUBDIRS = . m4macros gobject gmodule gthread docs build +-SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po ++SUBDIRS = . m4macros glib gobject gmodule gthread docs build po INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -@@ -160,7 +160,7 @@ - glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gpattern.h gprimes.h gqsort.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h +@@ -159,7 +159,7 @@ + BUILT_EXTRA_DIST = glibconfig.h.win32 config.h.win32 glib.spec -configexecincludedir = $(libdir)/glib-2.0/include +configexecincludedir = $(glibincludedir) CONFIGURE_DEPENDENCIES = acglib.m4 - BUILT_SOURCES = glib-config-2.0 + diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist index 39abd777f072..67ca9bede6d8 100644 --- a/devel/glib13/pkg-plist +++ b/devel/glib13/pkg-plist @@ -1,41 +1,62 @@ -bin/glib-config-2.0 bin/glib-genmarshal bin/glib-mkenums bin/gobject-query -include/glib-2.0/galloca.h -include/glib-2.0/garray.h -include/glib-2.0/gasyncqueue.h -include/glib-2.0/gbacktrace.h -include/glib-2.0/gcache.h -include/glib-2.0/gcompletion.h -include/glib-2.0/gconvert.h -include/glib-2.0/gdataset.h -include/glib-2.0/gdate.h -include/glib-2.0/gerror.h -include/glib-2.0/gfileutils.h -include/glib-2.0/ghash.h -include/glib-2.0/ghook.h -include/glib-2.0/giochannel.h include/glib-2.0/glib-object.h include/glib-2.0/glib.h +include/glib-2.0/glib/galloca.h +include/glib-2.0/glib/garray.h +include/glib-2.0/glib/gasyncqueue.h +include/glib-2.0/glib/gbacktrace.h +include/glib-2.0/glib/gcache.h +include/glib-2.0/glib/gcompletion.h +include/glib-2.0/glib/gconvert.h +include/glib-2.0/glib/gdataset.h +include/glib-2.0/glib/gdate.h +include/glib-2.0/glib/gerror.h +include/glib-2.0/glib/gfileutils.h +include/glib-2.0/glib/ghash.h +include/glib-2.0/glib/ghook.h +include/glib-2.0/glib/giochannel.h +include/glib-2.0/glib/glist.h +include/glib-2.0/glib/gmacros.h +include/glib-2.0/glib/gmain.h +include/glib-2.0/glib/gmarkup.h +include/glib-2.0/glib/gmem.h +include/glib-2.0/glib/gmessages.h +include/glib-2.0/glib/gnode.h +include/glib-2.0/glib/gpattern.h +include/glib-2.0/glib/gprimes.h +include/glib-2.0/glib/gqsort.h +include/glib-2.0/glib/gquark.h +include/glib-2.0/glib/gqueue.h +include/glib-2.0/glib/grand.h +include/glib-2.0/glib/grel.h +include/glib-2.0/glib/gscanner.h +include/glib-2.0/glib/gshell.h +include/glib-2.0/glib/gslist.h +include/glib-2.0/glib/gspawn.h +include/glib-2.0/glib/gstrfuncs.h +include/glib-2.0/glib/gstring.h +include/glib-2.0/glib/gthread.h +include/glib-2.0/glib/gthreadpool.h +include/glib-2.0/glib/gtimer.h +include/glib-2.0/glib/gtree.h +include/glib-2.0/glib/gtypes.h +include/glib-2.0/glib/gunicode.h +include/glib-2.0/glib/gutils.h +include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h -include/glib-2.0/glist.h -include/glib-2.0/gmacros.h -include/glib-2.0/gmain.h -include/glib-2.0/gmarkup.h -include/glib-2.0/gmem.h -include/glib-2.0/gmessages.h include/glib-2.0/gmodule.h -include/glib-2.0/gnode.h include/glib-2.0/gobject/gboxed.h -include/glib-2.0/gobject/gbsearcharray.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h include/glib-2.0/gobject/gmarshal.h include/glib-2.0/gobject/gobject.h +include/glib-2.0/gobject/gobjectnotifyqueue.c include/glib-2.0/gobject/gparam.h include/glib-2.0/gobject/gparamspecs.h include/glib-2.0/gobject/gsignal.h +include/glib-2.0/gobject/gsourceclosure.h include/glib-2.0/gobject/gtype.h include/glib-2.0/gobject/gtypemodule.h include/glib-2.0/gobject/gtypeplugin.h @@ -43,44 +64,40 @@ include/glib-2.0/gobject/gvalue.h include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h -include/glib-2.0/gpattern.h -include/glib-2.0/gprimes.h -include/glib-2.0/gqsort.h -include/glib-2.0/gquark.h -include/glib-2.0/gqueue.h -include/glib-2.0/grand.h -include/glib-2.0/grel.h -include/glib-2.0/gscanner.h -include/glib-2.0/gshell.h -include/glib-2.0/gslist.h -include/glib-2.0/gspawn.h -include/glib-2.0/gstrfuncs.h -include/glib-2.0/gstring.h -include/glib-2.0/gthread.h -include/glib-2.0/gthreadpool.h -include/glib-2.0/gtimer.h -include/glib-2.0/gtree.h -include/glib-2.0/gtypes.h -include/glib-2.0/gunicode.h -include/glib-2.0/gutils.h -include/glib-2.0/gwin32.h lib/libglib-1.3.a lib/libglib-1.3.so -lib/libglib-1.3.so.6 +lib/libglib-1.3.so.9 lib/libgmodule-1.3.a lib/libgmodule-1.3.so -lib/libgmodule-1.3.so.6 +lib/libgmodule-1.3.so.9 lib/libgobject-1.3.a lib/libgobject-1.3.so -lib/libgobject-1.3.so.6 +lib/libgobject-1.3.so.9 lib/libgthread-1.3.a lib/libgthread-1.3.so -lib/libgthread-1.3.so.6 +lib/libgthread-1.3.so.9 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 +share/locale/az/LC_MESSAGES/glib20.mo +share/locale/ca/LC_MESSAGES/glib20.mo +share/locale/de/LC_MESSAGES/glib20.mo +share/locale/es/LC_MESSAGES/glib20.mo +share/locale/eu/LC_MESSAGES/glib20.mo +share/locale/fr/LC_MESSAGES/glib20.mo +share/locale/nn/LC_MESSAGES/glib20.mo +share/locale/no/LC_MESSAGES/glib20.mo +share/locale/ru/LC_MESSAGES/glib20.mo +share/locale/sk/LC_MESSAGES/glib20.mo +share/locale/sl/LC_MESSAGES/glib20.mo +share/locale/sv/LC_MESSAGES/glib20.mo +share/locale/ta/LC_MESSAGES/glib20.mo +share/locale/tr/LC_MESSAGES/glib20.mo +share/locale/uk/LC_MESSAGES/glib20.mo +share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm include/glib-2.0/gobject +@dirrm include/glib-2.0/glib @dirrm include/glib-2.0 diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 7dd55b814ef2..eaa5328f3b04 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= glib -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -38,4 +38,7 @@ pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' +post-install: + ${INSTALL_DATA} ${WRKSRC}/glibconfig.h ${PREFIX}/include/glib-2.0 + .include <bsd.port.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 07b4a299dd12..dfd3010393ae 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1 +1 @@ -MD5 (glib-1.3.6.tar.gz) = fe116d632b3b628d8114ac5a56855722 +MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index e05693d07459..3b0ff24656f8 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Wed Jun 13 19:39:30 2001 -+++ configure Wed Aug 1 19:33:18 2001 -@@ -10018,6 +10018,12 @@ +--- configure.orig Tue Sep 25 18:36:39 2001 ++++ configure Wed Oct 24 10:00:12 2001 +@@ -9924,6 +9924,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; @@ -16,7 +16,7 @@ $FreeBSD$ esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -10488,8 +10494,8 @@ +@@ -10472,8 +10478,8 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -27,7 +27,7 @@ $FreeBSD$ # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support # -mthreads flag. -@@ -10569,13 +10575,13 @@ +@@ -10553,13 +10559,13 @@ fi ;; *) @@ -44,22 +44,22 @@ $FreeBSD$ fi if test x"$have_threads" = xposix; then defattr=0 -@@ -11114,6 +11120,7 @@ - if test "$cross_compiling" = yes; then +@@ -11058,6 +11064,7 @@ + if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else +# LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 11119 "configure" + #line 11063 "configure" #include "confdefs.h" -@@ -11481,14 +11488,14 @@ +@@ -11516,14 +11523,14 @@ # # Check for libiconv # - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:11486: checking for libiconv_open in -liconv" >&5 +-echo "configure:11521: checking for libiconv_open in -liconv" >&5 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:11486: checking for libiconv_open in -lgiconv" >&5 ++echo "configure:11521: checking for libiconv_open in -lgiconv" >&5 ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -68,9 +68,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 11494 "configure" + #line 11529 "configure" #include "confdefs.h" -@@ -11528,7 +11535,7 @@ +@@ -11563,7 +11570,7 @@ fi if test "x$with_libiconv" = "xyes" ; then diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag index 6303062bd037..7fdde4ddb14b 100644 --- a/devel/glib20/files/patch-ag +++ b/devel/glib20/files/patch-ag @@ -1,23 +1,23 @@ $FreeBSD$ ---- Makefile.in.orig Wed Jul 18 15:45:33 2001 -+++ Makefile.in Wed Jul 18 15:47:24 2001 -@@ -136,7 +136,7 @@ +--- Makefile.in.orig Wed Oct 24 10:00:39 2001 ++++ Makefile.in Wed Oct 24 10:01:07 2001 +@@ -147,7 +147,7 @@ AUTOMAKE_OPTIONS = 1.4 --SUBDIRS = . m4macros gobject gmodule gthread docs tests build -+SUBDIRS = . m4macros gobject gmodule gthread docs build +-SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po ++SUBDIRS = . m4macros glib gobject gmodule gthread docs build po INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -@@ -160,7 +160,7 @@ - glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gpattern.h gprimes.h gqsort.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h +@@ -159,7 +159,7 @@ + BUILT_EXTRA_DIST = glibconfig.h.win32 config.h.win32 glib.spec -configexecincludedir = $(libdir)/glib-2.0/include +configexecincludedir = $(glibincludedir) CONFIGURE_DEPENDENCIES = acglib.m4 - BUILT_SOURCES = glib-config-2.0 + diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 39abd777f072..67ca9bede6d8 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -1,41 +1,62 @@ -bin/glib-config-2.0 bin/glib-genmarshal bin/glib-mkenums bin/gobject-query -include/glib-2.0/galloca.h -include/glib-2.0/garray.h -include/glib-2.0/gasyncqueue.h -include/glib-2.0/gbacktrace.h -include/glib-2.0/gcache.h -include/glib-2.0/gcompletion.h -include/glib-2.0/gconvert.h -include/glib-2.0/gdataset.h -include/glib-2.0/gdate.h -include/glib-2.0/gerror.h -include/glib-2.0/gfileutils.h -include/glib-2.0/ghash.h -include/glib-2.0/ghook.h -include/glib-2.0/giochannel.h include/glib-2.0/glib-object.h include/glib-2.0/glib.h +include/glib-2.0/glib/galloca.h +include/glib-2.0/glib/garray.h +include/glib-2.0/glib/gasyncqueue.h +include/glib-2.0/glib/gbacktrace.h +include/glib-2.0/glib/gcache.h +include/glib-2.0/glib/gcompletion.h +include/glib-2.0/glib/gconvert.h +include/glib-2.0/glib/gdataset.h +include/glib-2.0/glib/gdate.h +include/glib-2.0/glib/gerror.h +include/glib-2.0/glib/gfileutils.h +include/glib-2.0/glib/ghash.h +include/glib-2.0/glib/ghook.h +include/glib-2.0/glib/giochannel.h +include/glib-2.0/glib/glist.h +include/glib-2.0/glib/gmacros.h +include/glib-2.0/glib/gmain.h +include/glib-2.0/glib/gmarkup.h +include/glib-2.0/glib/gmem.h +include/glib-2.0/glib/gmessages.h +include/glib-2.0/glib/gnode.h +include/glib-2.0/glib/gpattern.h +include/glib-2.0/glib/gprimes.h +include/glib-2.0/glib/gqsort.h +include/glib-2.0/glib/gquark.h +include/glib-2.0/glib/gqueue.h +include/glib-2.0/glib/grand.h +include/glib-2.0/glib/grel.h +include/glib-2.0/glib/gscanner.h +include/glib-2.0/glib/gshell.h +include/glib-2.0/glib/gslist.h +include/glib-2.0/glib/gspawn.h +include/glib-2.0/glib/gstrfuncs.h +include/glib-2.0/glib/gstring.h +include/glib-2.0/glib/gthread.h +include/glib-2.0/glib/gthreadpool.h +include/glib-2.0/glib/gtimer.h +include/glib-2.0/glib/gtree.h +include/glib-2.0/glib/gtypes.h +include/glib-2.0/glib/gunicode.h +include/glib-2.0/glib/gutils.h +include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h -include/glib-2.0/glist.h -include/glib-2.0/gmacros.h -include/glib-2.0/gmain.h -include/glib-2.0/gmarkup.h -include/glib-2.0/gmem.h -include/glib-2.0/gmessages.h include/glib-2.0/gmodule.h -include/glib-2.0/gnode.h include/glib-2.0/gobject/gboxed.h -include/glib-2.0/gobject/gbsearcharray.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h include/glib-2.0/gobject/gmarshal.h include/glib-2.0/gobject/gobject.h +include/glib-2.0/gobject/gobjectnotifyqueue.c include/glib-2.0/gobject/gparam.h include/glib-2.0/gobject/gparamspecs.h include/glib-2.0/gobject/gsignal.h +include/glib-2.0/gobject/gsourceclosure.h include/glib-2.0/gobject/gtype.h include/glib-2.0/gobject/gtypemodule.h include/glib-2.0/gobject/gtypeplugin.h @@ -43,44 +64,40 @@ include/glib-2.0/gobject/gvalue.h include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h -include/glib-2.0/gpattern.h -include/glib-2.0/gprimes.h -include/glib-2.0/gqsort.h -include/glib-2.0/gquark.h -include/glib-2.0/gqueue.h -include/glib-2.0/grand.h -include/glib-2.0/grel.h -include/glib-2.0/gscanner.h -include/glib-2.0/gshell.h -include/glib-2.0/gslist.h -include/glib-2.0/gspawn.h -include/glib-2.0/gstrfuncs.h -include/glib-2.0/gstring.h -include/glib-2.0/gthread.h -include/glib-2.0/gthreadpool.h -include/glib-2.0/gtimer.h -include/glib-2.0/gtree.h -include/glib-2.0/gtypes.h -include/glib-2.0/gunicode.h -include/glib-2.0/gutils.h -include/glib-2.0/gwin32.h lib/libglib-1.3.a lib/libglib-1.3.so -lib/libglib-1.3.so.6 +lib/libglib-1.3.so.9 lib/libgmodule-1.3.a lib/libgmodule-1.3.so -lib/libgmodule-1.3.so.6 +lib/libgmodule-1.3.so.9 lib/libgobject-1.3.a lib/libgobject-1.3.so -lib/libgobject-1.3.so.6 +lib/libgobject-1.3.so.9 lib/libgthread-1.3.a lib/libgthread-1.3.so -lib/libgthread-1.3.so.6 +lib/libgthread-1.3.so.9 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 +share/locale/az/LC_MESSAGES/glib20.mo +share/locale/ca/LC_MESSAGES/glib20.mo +share/locale/de/LC_MESSAGES/glib20.mo +share/locale/es/LC_MESSAGES/glib20.mo +share/locale/eu/LC_MESSAGES/glib20.mo +share/locale/fr/LC_MESSAGES/glib20.mo +share/locale/nn/LC_MESSAGES/glib20.mo +share/locale/no/LC_MESSAGES/glib20.mo +share/locale/ru/LC_MESSAGES/glib20.mo +share/locale/sk/LC_MESSAGES/glib20.mo +share/locale/sl/LC_MESSAGES/glib20.mo +share/locale/sv/LC_MESSAGES/glib20.mo +share/locale/ta/LC_MESSAGES/glib20.mo +share/locale/tr/LC_MESSAGES/glib20.mo +share/locale/uk/LC_MESSAGES/glib20.mo +share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm include/glib-2.0/gobject +@dirrm include/glib-2.0/glib @dirrm include/glib-2.0 diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index a6dcb4e23d2a..c1b8ac4b55b9 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -19,8 +19,8 @@ DISTNAME= gtk+-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-1.3.6:${PORTSDIR}/devel/glib13 \ - atk.2:${PORTSDIR}/devel/atk \ +LIB_DEPENDS= glib-1.3.9:${PORTSDIR}/devel/glib13 \ + atk.5:${PORTSDIR}/devel/atk \ pango.0:${PORTSDIR}/x11-toolkits/pango \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" PLIST_SUB= GTK_VERSION="${PORTVERSION}" -MAN1= gtk-config-2.0.1 +MAN1= gdk-pixbuf-csource.1 post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo index 0e9ba5742a08..9862e28b26c3 100644 --- a/x11-toolkits/gtk13/distinfo +++ b/x11-toolkits/gtk13/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3 +MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501 diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad index 592577b0bd6c..9c59e21c2577 100644 --- a/x11-toolkits/gtk13/files/patch-ad +++ b/x11-toolkits/gtk13/files/patch-ad @@ -1,23 +1,23 @@ $FreeBSD$ ---- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001 -+++ gtk/gtkrc.c Mon May 14 14:49:02 2001 -@@ -333,7 +333,7 @@ +--- gtk/gtkrc.c.orig Fri Sep 21 22:06:14 2001 ++++ gtk/gtkrc.c Wed Oct 24 10:31:00 2001 +@@ -359,7 +359,7 @@ result = g_strdup (im_module_file); else #ifndef G_OS_WIN32 -- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); -+ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); #else - result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ())); + result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL); #endif -@@ -439,7 +439,7 @@ +@@ -453,7 +453,7 @@ else { #ifndef G_OS_WIN32 -- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); -+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc"); +- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++ str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL); #else - str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ())); + str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL); #endif diff --git a/x11-toolkits/gtk13/files/patch-ag b/x11-toolkits/gtk13/files/patch-ag index 80e8096f3e26..a7e7df3d7490 100644 --- a/x11-toolkits/gtk13/files/patch-ag +++ b/x11-toolkits/gtk13/files/patch-ag @@ -1,14 +1,14 @@ $FreeBSD$ ---- gtk/Makefile.in.orig Mon May 14 13:48:47 2001 -+++ gtk/Makefile.in Mon May 14 13:50:45 2001 -@@ -158,7 +158,7 @@ +--- gtk/Makefile.in.orig Wed Oct 24 10:31:32 2001 ++++ gtk/Makefile.in Wed Oct 24 10:33:05 2001 +@@ -166,7 +166,7 @@ SUBDIRS = stock-icons --INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@ -+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@ +-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@ ++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@ gtarget = @gdktarget@ diff --git a/x11-toolkits/gtk13/files/patch-ah b/x11-toolkits/gtk13/files/patch-ah index e2d0389ddd02..32c2663f049f 100644 --- a/x11-toolkits/gtk13/files/patch-ah +++ b/x11-toolkits/gtk13/files/patch-ah @@ -1,9 +1,9 @@ $FreeBSD$ ---- docs/Makefile.in.orig Mon May 14 13:52:10 2001 -+++ docs/Makefile.in Mon May 14 13:52:40 2001 -@@ -130,7 +130,7 @@ +--- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001 ++++ docs/Makefile.in Wed Oct 24 10:33:46 2001 +@@ -136,7 +136,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ @@ -11,30 +11,4 @@ $FreeBSD$ +MAKEINFO = @MAKEINFO@ --no-split MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ -@@ -156,13 +156,13 @@ - - SUBDIRS = tutorial faq reference - --man_MANS = gtk-config.1 -+man_MANS = gtk-config-2.0.1 - - EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt README.linux-fb gtk-config.txt gtk-config.1.in gtkdocs_fix - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h --CONFIG_CLEAN_FILES = gtk-config.1 -+CONFIG_CLEAN_FILES = gtk-config-2.0.1 - man1dir = $(mandir)/man1 - MANS = $(man_MANS) - -@@ -185,6 +185,9 @@ - - gtk-config.1: $(top_builddir)/config.status gtk-config.1.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+gtk-config-2.0.1: gtk-config.1 -+ cp gtk-config.1 gtk-config-2.0.1 - - install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) + OBJEXT = @OBJEXT@ diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist index 7c5cca7ce9a3..2bf7bf0ed34f 100644 --- a/x11-toolkits/gtk13/pkg-plist +++ b/x11-toolkits/gtk13/pkg-plist @@ -1,15 +1,17 @@ +bin/gdk-pixbuf-csource bin/gtk-demo bin/gtk-query-immodules-2.0 -bin/make-inline-pixbuf etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h +include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkcolor.h -include/gtk-2.0/gdk/gdkcompat.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkcursors.h include/gtk-2.0/gdk/gdkdnd.h @@ -35,9 +37,6 @@ include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h -include/gtk-2.0/gdk/x11/gdkdrawable-x11.h -include/gtk-2.0/gdk/x11/gdkpixmap-x11.h -include/gtk-2.0/gdk/x11/gdkwindow-x11.h include/gtk-2.0/gtk/gdkconfig.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaccelgroup.h @@ -45,7 +44,6 @@ include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccessible.h include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h -include/gtk-2.0/gtk/gtkarg.h include/gtk-2.0/gtk/gtkarrow.h include/gtk-2.0/gtk/gtkaspectframe.h include/gtk-2.0/gtk/gtkbbox.h @@ -54,10 +52,10 @@ include/gtk-2.0/gtk/gtkbindings.h include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h +include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcellrenderer.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertext.h -include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h @@ -66,7 +64,6 @@ include/gtk-2.0/gtk/gtkclist.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h include/gtk-2.0/gtk/gtkcombo.h -include/gtk-2.0/gtk/gtkcompat.h include/gtk-2.0/gtk/gtkcontainer.h include/gtk-2.0/gtk/gtkctree.h include/gtk-2.0/gtk/gtkcurve.h @@ -120,7 +117,6 @@ include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h -include/gtk-2.0/gtk/gtkpacker.h include/gtk-2.0/gtk/gtkpaned.h include/gtk-2.0/gtk/gtkpixmap.h include/gtk-2.0/gtk/gtkplug.h @@ -177,6 +173,7 @@ include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h include/gtk-2.0/gtk/gtkvbbox.h include/gtk-2.0/gtk/gtkvbox.h +include/gtk-2.0/gtk/gtkversion.h include/gtk-2.0/gtk/gtkviewport.h include/gtk-2.0/gtk/gtkvpaned.h include/gtk-2.0/gtk/gtkvruler.h @@ -185,18 +182,6 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a @@ -211,6 +196,8 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a @@ -219,18 +206,30 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a +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.6 +lib/libgdk-x11-1.3.so.9 lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.so -lib/libgdk_pixbuf-1.3.so.6 +lib/libgdk_pixbuf-1.3.so.9 lib/libgdk_pixbuf_xlib-1.3.a lib/libgdk_pixbuf_xlib-1.3.so lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.so -lib/libgtk-x11-1.3.so.6 +lib/libgtk-x11-1.3.so.9 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc @@ -309,12 +308,12 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo @dirrm share/themes/Default @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 +@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 -@dirrm include/gtk-2.0/gdk/x11 @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index a6dcb4e23d2a..c1b8ac4b55b9 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -19,8 +19,8 @@ DISTNAME= gtk+-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-1.3.6:${PORTSDIR}/devel/glib13 \ - atk.2:${PORTSDIR}/devel/atk \ +LIB_DEPENDS= glib-1.3.9:${PORTSDIR}/devel/glib13 \ + atk.5:${PORTSDIR}/devel/atk \ pango.0:${PORTSDIR}/x11-toolkits/pango \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" PLIST_SUB= GTK_VERSION="${PORTVERSION}" -MAN1= gtk-config-2.0.1 +MAN1= gdk-pixbuf-csource.1 post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 0e9ba5742a08..9862e28b26c3 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3 +MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad index 592577b0bd6c..9c59e21c2577 100644 --- a/x11-toolkits/gtk20/files/patch-ad +++ b/x11-toolkits/gtk20/files/patch-ad @@ -1,23 +1,23 @@ $FreeBSD$ ---- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001 -+++ gtk/gtkrc.c Mon May 14 14:49:02 2001 -@@ -333,7 +333,7 @@ +--- gtk/gtkrc.c.orig Fri Sep 21 22:06:14 2001 ++++ gtk/gtkrc.c Wed Oct 24 10:31:00 2001 +@@ -359,7 +359,7 @@ result = g_strdup (im_module_file); else #ifndef G_OS_WIN32 -- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); -+ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); #else - result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ())); + result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL); #endif -@@ -439,7 +439,7 @@ +@@ -453,7 +453,7 @@ else { #ifndef G_OS_WIN32 -- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); -+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc"); +- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++ str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL); #else - str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ())); + str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL); #endif diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag index 80e8096f3e26..a7e7df3d7490 100644 --- a/x11-toolkits/gtk20/files/patch-ag +++ b/x11-toolkits/gtk20/files/patch-ag @@ -1,14 +1,14 @@ $FreeBSD$ ---- gtk/Makefile.in.orig Mon May 14 13:48:47 2001 -+++ gtk/Makefile.in Mon May 14 13:50:45 2001 -@@ -158,7 +158,7 @@ +--- gtk/Makefile.in.orig Wed Oct 24 10:31:32 2001 ++++ gtk/Makefile.in Wed Oct 24 10:33:05 2001 +@@ -166,7 +166,7 @@ SUBDIRS = stock-icons --INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@ -+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@ +-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@ ++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@ gtarget = @gdktarget@ diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index e2d0389ddd02..32c2663f049f 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,9 +1,9 @@ $FreeBSD$ ---- docs/Makefile.in.orig Mon May 14 13:52:10 2001 -+++ docs/Makefile.in Mon May 14 13:52:40 2001 -@@ -130,7 +130,7 @@ +--- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001 ++++ docs/Makefile.in Wed Oct 24 10:33:46 2001 +@@ -136,7 +136,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ @@ -11,30 +11,4 @@ $FreeBSD$ +MAKEINFO = @MAKEINFO@ --no-split MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ -@@ -156,13 +156,13 @@ - - SUBDIRS = tutorial faq reference - --man_MANS = gtk-config.1 -+man_MANS = gtk-config-2.0.1 - - EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt README.linux-fb gtk-config.txt gtk-config.1.in gtkdocs_fix - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h --CONFIG_CLEAN_FILES = gtk-config.1 -+CONFIG_CLEAN_FILES = gtk-config-2.0.1 - man1dir = $(mandir)/man1 - MANS = $(man_MANS) - -@@ -185,6 +185,9 @@ - - gtk-config.1: $(top_builddir)/config.status gtk-config.1.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+gtk-config-2.0.1: gtk-config.1 -+ cp gtk-config.1 gtk-config-2.0.1 - - install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) + OBJEXT = @OBJEXT@ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 7c5cca7ce9a3..2bf7bf0ed34f 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,15 +1,17 @@ +bin/gdk-pixbuf-csource bin/gtk-demo bin/gtk-query-immodules-2.0 -bin/make-inline-pixbuf etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h +include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkcolor.h -include/gtk-2.0/gdk/gdkcompat.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkcursors.h include/gtk-2.0/gdk/gdkdnd.h @@ -35,9 +37,6 @@ include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h -include/gtk-2.0/gdk/x11/gdkdrawable-x11.h -include/gtk-2.0/gdk/x11/gdkpixmap-x11.h -include/gtk-2.0/gdk/x11/gdkwindow-x11.h include/gtk-2.0/gtk/gdkconfig.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaccelgroup.h @@ -45,7 +44,6 @@ include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccessible.h include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h -include/gtk-2.0/gtk/gtkarg.h include/gtk-2.0/gtk/gtkarrow.h include/gtk-2.0/gtk/gtkaspectframe.h include/gtk-2.0/gtk/gtkbbox.h @@ -54,10 +52,10 @@ include/gtk-2.0/gtk/gtkbindings.h include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h +include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcellrenderer.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertext.h -include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h @@ -66,7 +64,6 @@ include/gtk-2.0/gtk/gtkclist.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h include/gtk-2.0/gtk/gtkcombo.h -include/gtk-2.0/gtk/gtkcompat.h include/gtk-2.0/gtk/gtkcontainer.h include/gtk-2.0/gtk/gtkctree.h include/gtk-2.0/gtk/gtkcurve.h @@ -120,7 +117,6 @@ include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h -include/gtk-2.0/gtk/gtkpacker.h include/gtk-2.0/gtk/gtkpaned.h include/gtk-2.0/gtk/gtkpixmap.h include/gtk-2.0/gtk/gtkplug.h @@ -177,6 +173,7 @@ include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h include/gtk-2.0/gtk/gtkvbbox.h include/gtk-2.0/gtk/gtkvbox.h +include/gtk-2.0/gtk/gtkversion.h include/gtk-2.0/gtk/gtkviewport.h include/gtk-2.0/gtk/gtkvpaned.h include/gtk-2.0/gtk/gtkvruler.h @@ -185,18 +182,6 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a @@ -211,6 +196,8 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a @@ -219,18 +206,30 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a +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.6 +lib/libgdk-x11-1.3.so.9 lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.so -lib/libgdk_pixbuf-1.3.so.6 +lib/libgdk_pixbuf-1.3.so.9 lib/libgdk_pixbuf_xlib-1.3.a lib/libgdk_pixbuf_xlib-1.3.so lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.so -lib/libgtk-x11-1.3.so.6 +lib/libgtk-x11-1.3.so.9 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc @@ -309,12 +308,12 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo @dirrm share/themes/Default @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 +@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 -@dirrm include/gtk-2.0/gdk/x11 @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index a6dcb4e23d2a..c1b8ac4b55b9 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -19,8 +19,8 @@ DISTNAME= gtk+-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-1.3.6:${PORTSDIR}/devel/glib13 \ - atk.2:${PORTSDIR}/devel/atk \ +LIB_DEPENDS= glib-1.3.9:${PORTSDIR}/devel/glib13 \ + atk.5:${PORTSDIR}/devel/atk \ pango.0:${PORTSDIR}/x11-toolkits/pango \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" PLIST_SUB= GTK_VERSION="${PORTVERSION}" -MAN1= gtk-config-2.0.1 +MAN1= gdk-pixbuf-csource.1 post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 0e9ba5742a08..9862e28b26c3 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.3.6.tar.gz) = ba55389ec8a540d5f489a92d58bfc1a3 +MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501 diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad index 592577b0bd6c..9c59e21c2577 100644 --- a/x11-toolkits/gtk30/files/patch-ad +++ b/x11-toolkits/gtk30/files/patch-ad @@ -1,23 +1,23 @@ $FreeBSD$ ---- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001 -+++ gtk/gtkrc.c Mon May 14 14:49:02 2001 -@@ -333,7 +333,7 @@ +--- gtk/gtkrc.c.orig Fri Sep 21 22:06:14 2001 ++++ gtk/gtkrc.c Wed Oct 24 10:31:00 2001 +@@ -359,7 +359,7 @@ result = g_strdup (im_module_file); else #ifndef G_OS_WIN32 -- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); -+ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); #else - result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ())); + result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL); #endif -@@ -439,7 +439,7 @@ +@@ -453,7 +453,7 @@ else { #ifndef G_OS_WIN32 -- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); -+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc"); +- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++ str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL); #else - str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ())); + str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL); #endif diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag index 80e8096f3e26..a7e7df3d7490 100644 --- a/x11-toolkits/gtk30/files/patch-ag +++ b/x11-toolkits/gtk30/files/patch-ag @@ -1,14 +1,14 @@ $FreeBSD$ ---- gtk/Makefile.in.orig Mon May 14 13:48:47 2001 -+++ gtk/Makefile.in Mon May 14 13:50:45 2001 -@@ -158,7 +158,7 @@ +--- gtk/Makefile.in.orig Wed Oct 24 10:31:32 2001 ++++ gtk/Makefile.in Wed Oct 24 10:33:05 2001 +@@ -166,7 +166,7 @@ SUBDIRS = stock-icons --INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@ -+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@ +-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@ ++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@ gtarget = @gdktarget@ diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah index e2d0389ddd02..32c2663f049f 100644 --- a/x11-toolkits/gtk30/files/patch-ah +++ b/x11-toolkits/gtk30/files/patch-ah @@ -1,9 +1,9 @@ $FreeBSD$ ---- docs/Makefile.in.orig Mon May 14 13:52:10 2001 -+++ docs/Makefile.in Mon May 14 13:52:40 2001 -@@ -130,7 +130,7 @@ +--- docs/Makefile.in.orig Wed Oct 24 10:33:45 2001 ++++ docs/Makefile.in Wed Oct 24 10:33:46 2001 +@@ -136,7 +136,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ @@ -11,30 +11,4 @@ $FreeBSD$ +MAKEINFO = @MAKEINFO@ --no-split MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ -@@ -156,13 +156,13 @@ - - SUBDIRS = tutorial faq reference - --man_MANS = gtk-config.1 -+man_MANS = gtk-config-2.0.1 - - EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt README.linux-fb gtk-config.txt gtk-config.1.in gtkdocs_fix - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h --CONFIG_CLEAN_FILES = gtk-config.1 -+CONFIG_CLEAN_FILES = gtk-config-2.0.1 - man1dir = $(mandir)/man1 - MANS = $(man_MANS) - -@@ -185,6 +185,9 @@ - - gtk-config.1: $(top_builddir)/config.status gtk-config.1.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+gtk-config-2.0.1: gtk-config.1 -+ cp gtk-config.1 gtk-config-2.0.1 - - install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) + OBJEXT = @OBJEXT@ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 7c5cca7ce9a3..2bf7bf0ed34f 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,15 +1,17 @@ +bin/gdk-pixbuf-csource bin/gtk-demo bin/gtk-query-immodules-2.0 -bin/make-inline-pixbuf etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h +include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkcolor.h -include/gtk-2.0/gdk/gdkcompat.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkcursors.h include/gtk-2.0/gdk/gdkdnd.h @@ -35,9 +37,6 @@ include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h -include/gtk-2.0/gdk/x11/gdkdrawable-x11.h -include/gtk-2.0/gdk/x11/gdkpixmap-x11.h -include/gtk-2.0/gdk/x11/gdkwindow-x11.h include/gtk-2.0/gtk/gdkconfig.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaccelgroup.h @@ -45,7 +44,6 @@ include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccessible.h include/gtk-2.0/gtk/gtkadjustment.h include/gtk-2.0/gtk/gtkalignment.h -include/gtk-2.0/gtk/gtkarg.h include/gtk-2.0/gtk/gtkarrow.h include/gtk-2.0/gtk/gtkaspectframe.h include/gtk-2.0/gtk/gtkbbox.h @@ -54,10 +52,10 @@ include/gtk-2.0/gtk/gtkbindings.h include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h +include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcellrenderer.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertext.h -include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h @@ -66,7 +64,6 @@ include/gtk-2.0/gtk/gtkclist.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h include/gtk-2.0/gtk/gtkcombo.h -include/gtk-2.0/gtk/gtkcompat.h include/gtk-2.0/gtk/gtkcontainer.h include/gtk-2.0/gtk/gtkctree.h include/gtk-2.0/gtk/gtkcurve.h @@ -120,7 +117,6 @@ include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h -include/gtk-2.0/gtk/gtkpacker.h include/gtk-2.0/gtk/gtkpaned.h include/gtk-2.0/gtk/gtkpixmap.h include/gtk-2.0/gtk/gtkplug.h @@ -177,6 +173,7 @@ include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h include/gtk-2.0/gtk/gtkvbbox.h include/gtk-2.0/gtk/gtkvbox.h +include/gtk-2.0/gtk/gtkversion.h include/gtk-2.0/gtk/gtkviewport.h include/gtk-2.0/gtk/gtkvpaned.h include/gtk-2.0/gtk/gtkvruler.h @@ -185,18 +182,6 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a -lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a @@ -211,6 +196,8 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a @@ -219,18 +206,30 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so +lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a +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.6 +lib/libgdk-x11-1.3.so.9 lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.so -lib/libgdk_pixbuf-1.3.so.6 +lib/libgdk_pixbuf-1.3.so.9 lib/libgdk_pixbuf_xlib-1.3.a lib/libgdk_pixbuf_xlib-1.3.so lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.so -lib/libgtk-x11-1.3.so.6 +lib/libgtk-x11-1.3.so.9 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc @@ -309,12 +308,12 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo @dirrm share/themes/Default @dirrm share/gtk-2.0/demo @dirrm share/gtk-2.0 +@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 -@dirrm include/gtk-2.0/gdk/x11 @dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk |