diff options
| -rw-r--r-- | devel/glib2/Makefile | 21 | ||||
| -rw-r--r-- | devel/glib2/PLIST | 170 | ||||
| -rw-r--r-- | devel/glib2/buildlink2.mk | 15 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 7 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ae | 22 |
5 files changed, 102 insertions, 133 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 715d15eb2ac..96addebd888 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.15 2002/12/19 13:07:10 grant Exp $ +# $NetBSD: Makefile,v 1.16 2002/12/24 03:36:58 wiz Exp $ # -DISTNAME= glib-2.0.7 +DISTNAME= glib-2.2.0 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= devel -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \ - ${MASTER_SITE_GNOME:=sources/glib/2.0/} +MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \ + ${MASTER_SITE_GNOME:=sources/glib/2.2/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org @@ -30,12 +30,6 @@ GNU_CONFIGURE= # defined CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib -.include "../../mk/bsd.prefs.mk" - -.if defined(USE_PTL2) -PTHREAD_OPTS+= native -.endif - test: build cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ tee ${WRKDIR}/check.log @@ -45,9 +39,4 @@ test: build .include "../../devel/pkgconfig/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CPPFLAGS+= -I${BUILDLINK_PREFIX.ptl2}/PTL/include -. include "../../devel/ptl2/buildlink2.mk" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 296d076e25a..506fbecc068 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/12/09 16:01:18 tron Exp $ +@comment $NetBSD: PLIST,v 1.7 2002/12/24 03:36:58 wiz Exp $ bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @@ -29,6 +29,7 @@ include/glib/glib-2.0/glib/gmessages.h include/glib/glib-2.0/glib/gnode.h include/glib/glib-2.0/glib/gpattern.h include/glib/glib-2.0/glib/gprimes.h +include/glib/glib-2.0/glib/gprintf.h include/glib/glib-2.0/glib/gqsort.h include/glib/glib-2.0/glib/gquark.h include/glib/glib-2.0/glib/gqueue.h @@ -70,23 +71,23 @@ lib/glib-2.0/include/glibconfig.h lib/libglib-2.0.a lib/libglib-2.0.la lib/libglib-2.0.so -lib/libglib-2.0.so.0 -lib/libglib-2.0.so.0.7 +lib/libglib-2.0.so.200 +lib/libglib-2.0.so.200.0 lib/libgmodule-2.0.a lib/libgmodule-2.0.la lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.0 -lib/libgmodule-2.0.so.0.7 +lib/libgmodule-2.0.so.200 +lib/libgmodule-2.0.so.200.0 lib/libgobject-2.0.a lib/libgobject-2.0.la lib/libgobject-2.0.so -lib/libgobject-2.0.so.0 -lib/libgobject-2.0.so.0.7 +lib/libgobject-2.0.so.200 +lib/libgobject-2.0.so.200.0 lib/libgthread-2.0.a lib/libgthread-2.0.la lib/libgthread-2.0.so -lib/libgthread-2.0.so.0 -lib/libgthread-2.0.so.0.7 +lib/libgthread-2.0.so.200 +lib/libgthread-2.0.so.200.0 lib/pkgconfig/glib-2.0.pc lib/pkgconfig/gmodule-2.0.pc lib/pkgconfig/gobject-2.0.pc @@ -96,100 +97,112 @@ man/man1/glib-mkenums.1 share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/glib-2.0/gettext/po/Makefile.in.in -share/gtk-doc/html/glib/glib-arrays.html -share/gtk-doc/html/glib/glib-asynchronous-queues.html -share/gtk-doc/html/glib/glib-automatic-string-completion.html -share/gtk-doc/html/glib/glib-balanced-binary-trees.html -share/gtk-doc/html/glib/glib-basic-types.html +share/gtk-doc/html/glib/glib-Arrays.html +share/gtk-doc/html/glib/glib-Asynchronous-Queues.html +share/gtk-doc/html/glib/glib-Automatic-String-Completion.html +share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html +share/gtk-doc/html/glib/glib-Basic-Types.html +share/gtk-doc/html/glib/glib-Byte-Arrays.html +share/gtk-doc/html/glib/glib-Byte-Order-Macros.html +share/gtk-doc/html/glib/glib-Caches.html +share/gtk-doc/html/glib/glib-Character-Set-Conversion.html +share/gtk-doc/html/glib/glib-Datasets.html +share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html +share/gtk-doc/html/glib/glib-Double-ended-Queues.html +share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html +share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html +share/gtk-doc/html/glib/glib-Error-Reporting.html +share/gtk-doc/html/glib/glib-File-Utilities.html +share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html +share/gtk-doc/html/glib/glib-Hash-Tables.html +share/gtk-doc/html/glib/glib-Hook-Functions.html +share/gtk-doc/html/glib/glib-IO-Channels.html +share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html +share/gtk-doc/html/glib/glib-Lexical-Scanner.html +share/gtk-doc/html/glib/glib-Limits-of-Basic-Types.html +share/gtk-doc/html/glib/glib-Memory-Allocation.html +share/gtk-doc/html/glib/glib-Memory-Allocators.html +share/gtk-doc/html/glib/glib-Memory-Chunks.html +share/gtk-doc/html/glib/glib-Message-Logging.html +share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html +share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html +share/gtk-doc/html/glib/glib-N-ary-Trees.html +share/gtk-doc/html/glib/glib-Numerical-Definitions.html +share/gtk-doc/html/glib/glib-Pointer-Arrays.html +share/gtk-doc/html/glib/glib-Quarks.html +share/gtk-doc/html/glib/glib-Random-Numbers.html +share/gtk-doc/html/glib/glib-Relations-and-Tuples.html +share/gtk-doc/html/glib/glib-Shell-related-Utilities.html +share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html +share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html +share/gtk-doc/html/glib/glib-Spawning-Processes.html +share/gtk-doc/html/glib/glib-Standard-Macros.html +share/gtk-doc/html/glib/glib-String-Chunks.html +share/gtk-doc/html/glib/glib-String-Utility-Functions.html +share/gtk-doc/html/glib/glib-Strings.html +share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html +share/gtk-doc/html/glib/glib-Thread-Pools.html +share/gtk-doc/html/glib/glib-Threads.html +share/gtk-doc/html/glib/glib-Timers.html +share/gtk-doc/html/glib/glib-Trash-Stacks.html +share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html +share/gtk-doc/html/glib/glib-Unicode-Manipulation.html +share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html +share/gtk-doc/html/glib/glib-Windows-Compatability-Functions.html share/gtk-doc/html/glib/glib-building.html -share/gtk-doc/html/glib/glib-byte-arrays.html -share/gtk-doc/html/glib/glib-byte-order-macros.html -share/gtk-doc/html/glib/glib-caches.html -share/gtk-doc/html/glib/glib-changes-2-0.html -share/gtk-doc/html/glib/glib-character-set-conversion.html +share/gtk-doc/html/glib/glib-changes.html share/gtk-doc/html/glib/glib-compiling.html share/gtk-doc/html/glib/glib-core.html share/gtk-doc/html/glib/glib-data-types.html -share/gtk-doc/html/glib/glib-datasets.html -share/gtk-doc/html/glib/glib-date-and-time-functions.html -share/gtk-doc/html/glib/glib-double-ended-queues.html -share/gtk-doc/html/glib/glib-doubly-linked-lists.html -share/gtk-doc/html/glib/glib-dynamic-loading-of-modules.html -share/gtk-doc/html/glib/glib-error-reporting.html -share/gtk-doc/html/glib/glib-file-utilities.html share/gtk-doc/html/glib/glib-fundamentals.html -share/gtk-doc/html/glib/glib-glob-style-pattern-matching.html -share/gtk-doc/html/glib/glib-hash-tables.html -share/gtk-doc/html/glib/glib-hook-functions.html -share/gtk-doc/html/glib/glib-io-channels.html -share/gtk-doc/html/glib/glib-keyed-data-lists.html -share/gtk-doc/html/glib/glib-lexical-scanner.html -share/gtk-doc/html/glib/glib-limits-of-basic-types.html -share/gtk-doc/html/glib/glib-memory-allocation.html -share/gtk-doc/html/glib/glib-memory-allocators.html -share/gtk-doc/html/glib/glib-memory-chunks.html -share/gtk-doc/html/glib/glib-message-logging.html -share/gtk-doc/html/glib/glib-miscellaneous-macros.html -share/gtk-doc/html/glib/glib-miscellaneous-utility-functions.html -share/gtk-doc/html/glib/glib-n-ary-trees.html -share/gtk-doc/html/glib/glib-numerical-definitions.html -share/gtk-doc/html/glib/glib-pointer-arrays.html -share/gtk-doc/html/glib/glib-quarks.html -share/gtk-doc/html/glib/glib-random-numbers.html -share/gtk-doc/html/glib/glib-relations-and-tuples.html share/gtk-doc/html/glib/glib-resources.html share/gtk-doc/html/glib/glib-running.html -share/gtk-doc/html/glib/glib-shell-related-utilities.html -share/gtk-doc/html/glib/glib-simple-xml-subset-parser.html -share/gtk-doc/html/glib/glib-singly-linked-lists.html -share/gtk-doc/html/glib/glib-spawning-processes.html -share/gtk-doc/html/glib/glib-standard-macros.html -share/gtk-doc/html/glib/glib-string-chunks.html -share/gtk-doc/html/glib/glib-string-utility-functions.html -share/gtk-doc/html/glib/glib-strings.html -share/gtk-doc/html/glib/glib-the-main-event-loop.html -share/gtk-doc/html/glib/glib-thread-pools.html -share/gtk-doc/html/glib/glib-threads.html -share/gtk-doc/html/glib/glib-timers.html -share/gtk-doc/html/glib/glib-trash-stacks.html -share/gtk-doc/html/glib/glib-type-conversion-macros.html -share/gtk-doc/html/glib/glib-unicode-manipulation.html share/gtk-doc/html/glib/glib-utilities.html -share/gtk-doc/html/glib/glib-warnings-and-assertions.html -share/gtk-doc/html/glib/glib-windows-compatability-functions.html +share/gtk-doc/html/glib/glib.devhelp share/gtk-doc/html/glib/glib.html +share/gtk-doc/html/glib/home.png share/gtk-doc/html/glib/index.html share/gtk-doc/html/glib/index.sgml +share/gtk-doc/html/glib/left.png share/gtk-doc/html/glib/mainloop-states.gif -share/gtk-doc/html/gobject/f4.html -share/gtk-doc/html/gobject/gobject-boxed-types.html -share/gtk-doc/html/gobject/gobject-closures.html -share/gtk-doc/html/gobject/gobject-enumeration-and-flag-types.html -share/gtk-doc/html/gobject/gobject-generic-values.html -share/gtk-doc/html/gobject/gobject-gparamspec.html -share/gtk-doc/html/gobject/gobject-gtype.html -share/gtk-doc/html/gobject/gobject-gtypemodule.html -share/gtk-doc/html/gobject/gobject-gtypeplugin.html -share/gtk-doc/html/gobject/gobject-signals.html -share/gtk-doc/html/gobject/gobject-standard-parameter-and-value-types.html -share/gtk-doc/html/gobject/gobject-the-base-object-type.html -share/gtk-doc/html/gobject/gobject-value-arrays.html -share/gtk-doc/html/gobject/gobject-varargs-value-collection.html +share/gtk-doc/html/glib/right.png +share/gtk-doc/html/glib/up.png +share/gtk-doc/html/gobject/gobject-Boxed-Types.html +share/gtk-doc/html/gobject/gobject-Closures.html +share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html +share/gtk-doc/html/gobject/gobject-GParamSpec.html +share/gtk-doc/html/gobject/gobject-GType.html +share/gtk-doc/html/gobject/gobject-GTypeModule.html +share/gtk-doc/html/gobject/gobject-GTypePlugin.html +share/gtk-doc/html/gobject/gobject-Generic-values.html +share/gtk-doc/html/gobject/gobject-Signals.html +share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html +share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html +share/gtk-doc/html/gobject/gobject-Value-arrays.html +share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html +share/gtk-doc/html/gobject/gobject.devhelp +share/gtk-doc/html/gobject/home.png share/gtk-doc/html/gobject/index.html share/gtk-doc/html/gobject/index.sgml -share/gtk-doc/html/gobject/r28.html -${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/glib20.mo +share/gtk-doc/html/gobject/left.png +share/gtk-doc/html/gobject/pr01.html +share/gtk-doc/html/gobject/right.png +share/gtk-doc/html/gobject/rn01.html +share/gtk-doc/html/gobject/up.png ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/glib20.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/glib20.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/glib20.mo +${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/glib20.mo @@ -203,6 +216,7 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/glib20.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/glib20.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/glib20.mo diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk index aa89899b812..3212eb1ce5e 100644 --- a/devel/glib2/buildlink2.mk +++ b/devel/glib2/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.7 2002/10/16 03:14:41 rh Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2002/12/24 03:36:58 wiz Exp $ .if !defined(GLIB2_BUILDLINK2_MK) GLIB2_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= glib2 -BUILDLINK_DEPENDS.glib2?= glib2>=2.0.6nb2 +BUILDLINK_DEPENDS.glib2?= glib2>=2.2.0 BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2 EVAL_PREFIX+= BUILDLINK_PREFIX.glib2=glib2 @@ -21,19 +21,8 @@ BUILDLINK_FILES.glib2+= lib/libgthread-2.0.* .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" -.include "../../mk/bsd.prefs.mk" - -.if defined(USE_PTL2) -PTHREAD_OPTS+= native -.endif - .include "../../mk/pthread.buildlink2.mk" -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -. include "../../devel/ptl2/buildlink2.mk" -CPPFLAGS+= ${BUILDLINK_CPPFLAGS.ptl2} -.endif - BUILDLINK_TARGETS+= glib2-buildlink glib2-buildlink: _BUILDLINK_USE diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 8e9d485632d..02a911da534 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.10 2002/12/19 13:07:10 grant Exp $ +$NetBSD: distinfo,v 1.11 2002/12/24 03:36:58 wiz Exp $ -SHA1 (glib-2.0.7.tar.bz2) = 6ef03d8ebb17aa5bff2a8d0bfe59eccc9d45a2ba -Size (glib-2.0.7.tar.bz2) = 1510735 bytes -SHA1 (patch-ae) = 595a79aea5bbe65a10e34084629900b1da7b4b7b +SHA1 (glib-2.2.0.tar.bz2) = ec3c19d2ebb498e1036cec8fcc8ace57331ce290 +Size (glib-2.2.0.tar.bz2) = 1494036 bytes diff --git a/devel/glib2/patches/patch-ae b/devel/glib2/patches/patch-ae deleted file mode 100644 index 8f335cb7ab5..00000000000 --- a/devel/glib2/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $ - ---- configure.orig Fri Mar 8 10:54:21 2002 -+++ configure -@@ -6123,7 +6123,7 @@ - - # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale" -+GLIB_LOCALE_DIR="${prefix}/${PKGLOCALEDIR}/locale" - cat >>confdefs.h <<_ACEOF - #define GLIB_LOCALE_DIR "$GLIB_LOCALE_DIR" - _ACEOF -@@ -16852,7 +16852,7 @@ - G_THREAD_LIBS="-pthread" - ;; - *) -- for thread_lib in "" pthread pthread32 pthreads thread dce; do -+ for thread_lib in "" PTL pthread pthread32 pthreads thread dce; do - if test x"$thread_lib" = x; then - add_thread_lib="" - IN="" |