diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-07 18:42:25 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-07 18:42:25 +0000 |
| commit | 336b31c3940aea29270fc9fd9b51d3ba1633729e (patch) | |
| tree | ab986f61fb6fef3625ba83cee9ea5d304243bfe8 /devel | |
| parent | d02465ee5bd1e47c51b942f66a4c99d7dc742601 (diff) | |
| download | ports-336b31c3940aea29270fc9fd9b51d3ba1633729e.tar.gz ports-336b31c3940aea29270fc9fd9b51d3ba1633729e.zip | |
Notes
Diffstat (limited to 'devel')
57 files changed, 622 insertions, 355 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index f2d205dea3b1..5898a1a822cb 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.4.4 +PORTVERSION= 2.6.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,12 +23,14 @@ USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ARGS= --disable-indent CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: +post-patch: @find ${WRKSRC} -type f | xargs ${GREP} -l LINC_THREADSAFE | \ xargs ${REINPLACE_CMD} -e 's|LINC_THREADSAFE|G_THREADS_ENABLED|g' diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 1e4f3cc849fb..7534e5224241 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ORBit2-2.4.4.tar.bz2) = e487accae11949d606938e2678191f05 +MD5 (gnome2/ORBit2-2.6.0.tar.bz2) = c0b26f13f63db89503234d9367962e23 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index 6b72dbaeed3c..308fddd87618 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.in.orig Mon Jan 28 19:56:23 2002 -+++ Makefile.in Wed Feb 13 10:48:08 2002 +--- Makefile.in.orig Sat Oct 19 15:24:09 2002 ++++ Makefile.in Sat Oct 19 15:25:58 2002 @@ -35,7 +35,7 @@ DESTDIR = @@ -12,7 +9,7 @@ $FreeBSD$ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -93,11 +93,10 @@ +@@ -97,11 +97,10 @@ STRIP = @STRIP@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -25,12 +22,3 @@ $FreeBSD$ bin_SCRIPTS = orbit2-config -@@ -107,7 +106,7 @@ - m4datadir = $(datadir)/aclocal - m4data_DATA = ORBit2.m4 - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(pkglibdir) - pkgconfig_DATA = ORBit-2.0.pc ORBit-CosNaming-2.0.pc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index a58ff8822d71..5a806118bb68 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -5,6 +5,7 @@ etc/orbit2rc.default @exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi include/orbit-2.0/ORBitservices/CosNaming.h include/orbit-2.0/ORBitservices/CosNaming_impl.h +include/orbit-2.0/orbit-idl/orbit-idl-backend.h include/orbit-2.0/orbit/GIOP/giop-basics.h include/orbit-2.0/orbit/GIOP/giop-connection.h include/orbit-2.0/orbit/GIOP/giop-endian.h @@ -62,6 +63,7 @@ lib/libORBitCosNaming-2.so lib/libORBitCosNaming-2.so.0 lib/libname-server-2.a libdata/pkgconfig/ORBit-2.0.pc +libdata/pkgconfig/ORBit-idl-2.0.pc libdata/pkgconfig/ORBit-CosNaming-2.0.pc share/aclocal/ORBit2.m4 share/idl/orbit-2.0/CosNaming.idl @@ -73,5 +75,6 @@ share/idl/orbit-2.0/CosNaming.idl @dirrm include/orbit-2.0/orbit/dynamic @dirrm include/orbit-2.0/orbit/GIOP @dirrm include/orbit-2.0/orbit +@dirrm include/orbit-2.0/orbit-idl @dirrm include/orbit-2.0/ORBitservices @dirrm include/orbit-2.0 diff --git a/devel/atk/Makefile b/devel/atk/Makefile index 5b20ed3bce09..6ca7fa395a88 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -6,11 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.0.3 +PORTVERSION= 1.2.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 #MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ # ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ # http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,19 +20,19 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static +USE_GNOMENG= yes +USE_GNOME= gnomehack +CONFIGURE_ARGS= --enable-static \ + --disable-gtk-doc \ + --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/devel/atk/distinfo b/devel/atk/distinfo index e6cf774217f5..50cdc842bcf9 100644 --- a/devel/atk/distinfo +++ b/devel/atk/distinfo @@ -1 +1 @@ -MD5 (gnome2/atk-1.0.3.tar.bz2) = 9041396017f8207b8aa2bece27eb5ebb +MD5 (gnome2/atk-1.2.2.tar.bz2) = 2c42e4322d1a199cdd7479fb1d09879c diff --git a/devel/atk/files/patch-Makefile.in b/devel/atk/files/patch-Makefile.in index be30e08fdddc..90d6da723065 100644 --- a/devel/atk/files/patch-Makefile.in +++ b/devel/atk/files/patch-Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Aug 1 20:32:06 2001 -+++ Makefile.in Wed Aug 1 20:33:45 2001 -@@ -96,7 +96,7 @@ - STRIP = @STRIP@ - VERSION = @VERSION@ +--- Makefile.in.orig Fri Nov 8 17:09:46 2002 ++++ Makefile.in Fri Nov 8 17:10:22 2002 +@@ -116,7 +116,7 @@ + atktargetlib = @atktargetlib@ + ms_librarian = @ms_librarian@ --SUBDIRS = atk tests docs -+SUBDIRS = atk +-SUBDIRS = atk tests docs po ++SUBDIRS = atk docs po - EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in + EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in atk.spec.in atk.spec atk-zip.sh diff --git a/devel/atk/files/patch-docs_Makefile.in b/devel/atk/files/patch-docs_Makefile.in new file mode 100644 index 000000000000..b40046ee22c3 --- /dev/null +++ b/devel/atk/files/patch-docs_Makefile.in @@ -0,0 +1,10 @@ +--- docs/Makefile.in.orig Fri Jan 24 16:45:09 2003 ++++ docs/Makefile.in Fri Jan 24 16:45:09 2003 +@@ -274,6 +274,7 @@ + dist-hook-local: all-local + + @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp ++@ENABLE_GTK_DOC_FALSE@all-local: + + #### scan #### + diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist index a657b8a6397a..43664cddbf4e 100644 --- a/devel/atk/pkg-plist +++ b/devel/atk/pkg-plist @@ -15,6 +15,7 @@ include/atk-1.0/atk/atkobjectfactory.h include/atk-1.0/atk/atkregistry.h include/atk-1.0/atk/atkrelation.h include/atk-1.0/atk/atkrelationset.h +include/atk-1.0/atk/atkrelationtype.h include/atk-1.0/atk/atkselection.h include/atk-1.0/atk/atkstate.h include/atk-1.0/atk/atkstateset.h @@ -25,7 +26,59 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.0 +lib/libatk-1.0.so.200 libdata/pkgconfig/atk.pc +share/doc/atk/atk-atkstate.html +share/doc/atk/atk.html +share/doc/atk/atkaction.html +share/doc/atk/atkcomponent.html +share/doc/atk/atkdocument.html +share/doc/atk/atkeditabletext.html +share/doc/atk/atkhypertext.html +share/doc/atk/atkimage.html +share/doc/atk/atkgobjectaccessible.html +share/doc/atk/atkhyperlink.html +share/doc/atk/atknoopobject.html +share/doc/atk/atknoopobjectfactory.html +share/doc/atk/atkobject.html +share/doc/atk/atkobjectfactory.html +share/doc/atk/atkregistry.html +share/doc/atk/atkrelation.html +share/doc/atk/atkrelationset.html +share/doc/atk/atkselection.html +share/doc/atk/atkstateset.html +share/doc/atk/atkstreamablecontent.html +share/doc/atk/atktable.html +share/doc/atk/atktext.html +share/doc/atk/atkutil.html +share/doc/atk/atkvalue.html +share/doc/atk/book1.html +share/doc/atk/index.sgml +share/locale/bg/LC_MESSAGES/atk10.mo +share/locale/ca/LC_MESSAGES/atk10.mo +share/locale/cs/LC_MESSAGES/atk10.mo +share/locale/da/LC_MESSAGES/atk10.mo +share/locale/de/LC_MESSAGES/atk10.mo +share/locale/el/LC_MESSAGES/atk10.mo +share/locale/en_GB/LC_MESSAGES/atk10.mo +share/locale/es/LC_MESSAGES/atk10.mo +share/locale/fi/LC_MESSAGES/atk10.mo +share/locale/fr/LC_MESSAGES/atk10.mo +share/locale/he/LC_MESSAGES/atk10.mo +share/locale/hu/LC_MESSAGES/atk10.mo +share/locale/it/LC_MESSAGES/atk10.mo +share/locale/ko/LC_MESSAGES/atk10.mo +share/locale/lv/LC_MESSAGES/atk10.mo +share/locale/ms/LC_MESSAGES/atk10.mo +share/locale/nl/LC_MESSAGES/atk10.mo +share/locale/no/LC_MESSAGES/atk10.mo +share/locale/pl/LC_MESSAGES/atk10.mo +share/locale/ru/LC_MESSAGES/atk10.mo +share/locale/sq/LC_MESSAGES/atk10.mo +share/locale/sv/LC_MESSAGES/atk10.mo +share/locale/uk/LC_MESSAGES/atk10.mo +share/locale/vi/LC_MESSAGES/atk10.mo +share/locale/zh_CN/LC_MESSAGES/atk10.mo +@dirrm share/doc/atk @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile index d8bcc040d8d7..c44edca6d5d9 100644 --- a/devel/bonobo-activation/Makefile +++ b/devel/bonobo-activation/Makefile @@ -6,12 +6,11 @@ # PORTNAME= bonobo-activation -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 2.2.1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo index 12555f159da1..ef044191ded4 100644 --- a/devel/bonobo-activation/distinfo +++ b/devel/bonobo-activation/distinfo @@ -1 +1 @@ -MD5 (gnome2/bonobo-activation-1.0.4.tar.bz2) = 2b68d7a94d195cbcca15fcb63e55fb6a +MD5 (gnome2/bonobo-activation-2.2.1.tar.bz2) = bb7f6875eba86928c9ec072cf8c887da diff --git a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c index e3db3eedc374..db8d816a89d2 100644 --- a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c +++ b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c @@ -1,11 +1,11 @@ ---- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Nov 8 03:19:52 2002 -+++ bonobo-activation/bonobo-activation-fork-server.c Fri Nov 8 03:20:04 2002 -@@ -396,6 +396,8 @@ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Oct 18 06:15:11 2002 ++++ bonobo-activation/bonobo-activation-fork-server.c Sat Oct 19 15:35:03 2002 +@@ -364,6 +364,8 @@ } else if ((childpid = fork ())) { _exit (0); /* de-zombifier process, just exit */ } else { + sigprocmask (SIG_SETMASK, &omask, NULL); + - if (display) - bonobo_activation_setenv ("DISPLAY", display); - if (session_manager) + setenv_activation_environment (environment); + + if (od_iorstr != NULL) { diff --git a/devel/bonobo-activation/files/patch-server::Makefile.in b/devel/bonobo-activation/files/patch-server::Makefile.in index aad85b8a56c8..80acb58f6dd8 100644 --- a/devel/bonobo-activation/files/patch-server::Makefile.in +++ b/devel/bonobo-activation/files/patch-server::Makefile.in @@ -1,5 +1,5 @@ ---- server/Makefile.in.orig Fri Nov 8 03:18:57 2002 -+++ server/Makefile.in Fri Nov 8 03:19:22 2002 +--- server/Makefile.in.orig Sat Oct 19 15:35:36 2002 ++++ server/Makefile.in Sat Oct 19 15:37:02 2002 @@ -154,7 +154,7 @@ -I$(top_builddir) \ -I$(top_builddir)/bonobo-activation \ diff --git a/devel/bonobo-activation/files/patch-server::activation-server-main.c b/devel/bonobo-activation/files/patch-server::activation-server-main.c index a6c4e34fa107..56d3537786c3 100644 --- a/devel/bonobo-activation/files/patch-server::activation-server-main.c +++ b/devel/bonobo-activation/files/patch-server::activation-server-main.c @@ -1,6 +1,6 @@ ---- server/activation-server-main.c.orig Tue Oct 29 05:51:19 2002 -+++ server/activation-server-main.c Fri Nov 8 03:21:04 2002 -@@ -131,7 +131,7 @@ +--- server/activation-server-main.c.orig Fri Oct 18 06:15:12 2002 ++++ server/activation-server-main.c Sat Nov 9 01:50:36 2002 +@@ -127,7 +127,7 @@ g_string_append (gnome_od_source_dir, gnome_dirs[i]); g_string_append (gnome_od_source_dir, diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist index b27389f39a2b..276125f438c8 100644 --- a/devel/bonobo-activation/pkg-plist +++ b/devel/bonobo-activation/pkg-plist @@ -26,61 +26,37 @@ libdata/bonobo/servers/plugin.server libdata/pkgconfig/bonobo-activation-2.0.pc libexec/bonobo-activation-server sbin/bonobo-activation-sysconf -share/doc/bonobo-activation/api-reference.html -share/doc/bonobo-activation/architecture.html -share/doc/bonobo-activation/async-activation.html -share/doc/bonobo-activation/attribute-tag.html -share/doc/bonobo-activation/bonobo-activation-debugging.html -share/doc/bonobo-activation/bonobo-activation-initialization.html -share/doc/bonobo-activation/bonobo-activation-query-and-activation.html -share/doc/bonobo-activation/bonobo-activation-registration.html -share/doc/bonobo-activation/bonobo-activation-utilities.html -share/doc/bonobo-activation/bonobo-activation.png -share/doc/bonobo-activation/checklist.html -share/doc/bonobo-activation/configuring.html -share/doc/bonobo-activation/fdl-section1.html -share/doc/bonobo-activation/fdl-section10.html -share/doc/bonobo-activation/fdl-section2.html -share/doc/bonobo-activation/fdl-section3.html -share/doc/bonobo-activation/fdl-section4.html -share/doc/bonobo-activation/fdl-section5.html -share/doc/bonobo-activation/fdl-section6.html -share/doc/bonobo-activation/fdl-section7.html -share/doc/bonobo-activation/fdl-section8.html -share/doc/bonobo-activation/fdl-section9.html -share/doc/bonobo-activation/fdl-using.html -share/doc/bonobo-activation/fdl.html -share/doc/bonobo-activation/index.html -share/doc/bonobo-activation/index.sgml -share/doc/bonobo-activation/migrating.html -share/doc/bonobo-activation/query-langage.html -share/doc/bonobo-activation/query-syntax.html -share/doc/bonobo-activation/server-arch.html -share/doc/bonobo-activation/server-xml-reference.html -share/doc/bonobo-activation/tutorial.html share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl +share/locale/am/LC_MESSAGES/bonobo-activation.mo share/locale/az/LC_MESSAGES/bonobo-activation.mo share/locale/ar/LC_MESSAGES/bonobo-activation.mo +share/locale/be/LC_MESSAGES/bonobo-activation.mo share/locale/bg/LC_MESSAGES/bonobo-activation.mo share/locale/ca/LC_MESSAGES/bonobo-activation.mo +share/locale/cs/LC_MESSAGES/bonobo-activation.mo share/locale/da/LC_MESSAGES/bonobo-activation.mo share/locale/de/LC_MESSAGES/bonobo-activation.mo share/locale/el/LC_MESSAGES/bonobo-activation.mo share/locale/es/LC_MESSAGES/bonobo-activation.mo +share/locale/fa/LC_MESSAGES/bonobo-activation.mo share/locale/fi/LC_MESSAGES/bonobo-activation.mo share/locale/fr/LC_MESSAGES/bonobo-activation.mo share/locale/ga/LC_MESSAGES/bonobo-activation.mo share/locale/gl/LC_MESSAGES/bonobo-activation.mo +share/locale/he/LC_MESSAGES/bonobo-activation.mo share/locale/hi/LC_MESSAGES/bonobo-activation.mo share/locale/hu/LC_MESSAGES/bonobo-activation.mo +share/locale/id/LC_MESSAGES/bonobo-activation.mo share/locale/it/LC_MESSAGES/bonobo-activation.mo share/locale/ja/LC_MESSAGES/bonobo-activation.mo share/locale/ko/LC_MESSAGES/bonobo-activation.mo share/locale/lv/LC_MESSAGES/bonobo-activation.mo +share/locale/mk/LC_MESSAGES/bonobo-activation.mo +share/locale/mn/LC_MESSAGES/bonobo-activation.mo share/locale/ms/LC_MESSAGES/bonobo-activation.mo share/locale/nl/LC_MESSAGES/bonobo-activation.mo share/locale/nn/LC_MESSAGES/bonobo-activation.mo @@ -92,15 +68,16 @@ share/locale/ro/LC_MESSAGES/bonobo-activation.mo share/locale/ru/LC_MESSAGES/bonobo-activation.mo share/locale/sk/LC_MESSAGES/bonobo-activation.mo share/locale/sl/LC_MESSAGES/bonobo-activation.mo +share/locale/sq/LC_MESSAGES/bonobo-activation.mo share/locale/sv/LC_MESSAGES/bonobo-activation.mo share/locale/ta/LC_MESSAGES/bonobo-activation.mo share/locale/tr/LC_MESSAGES/bonobo-activation.mo share/locale/uk/LC_MESSAGES/bonobo-activation.mo share/locale/vi/LC_MESSAGES/bonobo-activation.mo +share/locale/wa/LC_MESSAGES/bonobo-activation.mo share/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo @dirrm share/idl/bonobo-activation-2.0 -@dirrm share/doc/bonobo-activation @dirrm libdata/bonobo/servers @dirrm libdata/bonobo @dirrm include/bonobo-activation-2.0/bonobo-activation diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 5b71060c82cb..3c08f1d4d82a 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bugbuddy2 -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.102 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/bug-buddy/2.2 @@ -15,26 +15,23 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= bug-buddy.1 -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index 872361f759c0..c258a0ca130d 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1 +1 @@ -MD5 (gnome2/bug-buddy-2.2.0.tar.bz2) = c98a12f48a1f0c8697a7937a4a7d08a1 +MD5 (gnome2/bug-buddy-2.2.102.tar.bz2) = 154ecb6e924cf25aebf0610cc3e38be2 diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist index d21dc8b68f19..7636bb7796c7 100644 --- a/devel/bugbuddy2/pkg-plist +++ b/devel/bugbuddy2/pkg-plist @@ -19,9 +19,12 @@ share/gnome/help/bug-buddy/C/legal.xml share/gnome/mime-info/bug-buddy.keys share/gnome/mime-info/bug-buddy.mime share/gnome/omf/bug-buddy/bug-buddy-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/bug-buddy.png +share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo share/locale/az/LC_MESSAGES/bug-buddy.mo +share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/bg/LC_MESSAGES/bug-buddy.mo share/locale/ca/LC_MESSAGES/bug-buddy.mo share/locale/cs/LC_MESSAGES/bug-buddy.mo @@ -36,12 +39,15 @@ share/locale/fi/LC_MESSAGES/bug-buddy.mo share/locale/fr/LC_MESSAGES/bug-buddy.mo share/locale/ga/LC_MESSAGES/bug-buddy.mo share/locale/gl/LC_MESSAGES/bug-buddy.mo +share/locale/he/LC_MESSAGES/bug-buddy.mo share/locale/hu/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo share/locale/lt/LC_MESSAGES/bug-buddy.mo share/locale/lv/LC_MESSAGES/bug-buddy.mo +share/locale/mk/LC_MESSAGES/bug-buddy.mo +share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo @@ -53,6 +59,7 @@ share/locale/ro/LC_MESSAGES/bug-buddy.mo share/locale/ru/LC_MESSAGES/bug-buddy.mo share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo +share/locale/sq/LC_MESSAGES/bug-buddy.mo share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo @@ -67,3 +74,4 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/bug-buddy/bugzilla/gnome @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index bb54a6c674af..f47d5186f56f 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 1.2.1 +PORTVERSION= 2.2.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/1.2 +MASTER_SITE_SUBDIR= sources/GConf/2.2 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= ORBit-2.0:${PORTSDIR}/devel/ORBit2 \ xml2.5:${PORTSDIR}/textproc/libxml2 \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_GMAKE= yes @@ -35,6 +35,8 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index cf74a49ffc84..790114ae0751 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1 +1 @@ -MD5 (gnome2/GConf-1.2.1.tar.bz2) = 4e5ffdebd7dbf6d86459f6e57f8d772c +MD5 (gnome2/GConf-2.2.0.tar.bz2) = 07ed2f6c583d5664cd728787cf59219b diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 180dc0cbf885..dc75fdb1daa7 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -49,6 +49,7 @@ share/doc/gconf/x462.html share/doc/gconf/x485.html share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/az/LC_MESSAGES/GConf2.mo +share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo share/locale/ca/LC_MESSAGES/GConf2.mo share/locale/cs/LC_MESSAGES/GConf2.mo @@ -65,6 +66,7 @@ share/locale/hu/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo +share/locale/lv/LC_MESSAGES/GConf2.mo share/locale/ms/LC_MESSAGES/GConf2.mo share/locale/nl/LC_MESSAGES/GConf2.mo share/locale/nn/LC_MESSAGES/GConf2.mo @@ -82,8 +84,11 @@ share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo +share/sgml/gconf/gconf-1.0.dtd +@dirrm share/sgml/gconf @dirrm share/doc/gconf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 @dirrm etc/gconf/2 +@unexec /bin/rmdir %D/share/sgml 2>/dev/null || /usr/bin/true diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index a07cd062dae9..4118b66d802d 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,9 +6,9 @@ # PORTNAME= glib -PORTVERSION= 2.0.7 +PORTVERSION= 2.2.1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.0,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -35,7 +35,7 @@ USE_GMAKE= yes USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index cd80c6bbff02..4ec1b98ee324 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1 +1 @@ -MD5 (gnome2/glib-2.0.7.tar.bz2) = 5882b1e729f57cb18af653a2f504197b +MD5 (gnome2/glib-2.2.1.tar.bz2) = 42406a17819080326e105f8333963b97 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index fc794d3256de..659943e02833 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Fri Mar 29 01:26:14 2002 -+++ configure Fri Apr 26 09:01:50 2002 -@@ -10597,6 +10597,7 @@ +--- configure.orig Mon Dec 2 16:34:49 2002 ++++ configure Tue Dec 3 18:21:22 2002 +@@ -11259,6 +11259,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,23 +8,3 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -17619,8 +17620,8 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - ;; -- *-freebsd2.2*) -- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" -+ *-freebsd*) -+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS" - - # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support - # -mthreads flag. -@@ -17702,7 +17703,7 @@ - *-*-openbsd* | *-*-freebsd*) - # FreeBSD and OpenBSD want us to use the -pthread flag - # instead of linking to -lc_r and libtool enforces that. -- G_THREAD_LIBS="-pthread" -+ G_THREAD_LIBS="$PTHREAD_LIBS" - ;; - *) - for thread_lib in "" pthread pthread32 pthreads thread dce; do diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 8ec95ad45521..52d8bb07ad1c 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -28,6 +28,7 @@ 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/gprintf.h include/glib-2.0/glib/gqsort.h include/glib-2.0/glib/gquark.h include/glib-2.0/glib/gqueue.h @@ -68,16 +69,16 @@ include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/libglib-2.0.a lib/libglib-2.0.so -lib/libglib-2.0.so.0 +lib/libglib-2.0.so.200 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.0 +lib/libgmodule-2.0.so.200 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.0 +lib/libgobject-2.0.so.200 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.0 +lib/libgthread-2.0.so.200 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gobject-2.0.pc @@ -85,20 +86,26 @@ libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/glib-2.0/gettext/po/Makefile.in.in -share/locale/ar/LC_MESSAGES/glib20.mo +share/locale/am/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/bg/LC_MESSAGES/glib20.mo +share/locale/bn/LC_MESSAGES/glib20.mo share/locale/ca/LC_MESSAGES/glib20.mo share/locale/cs/LC_MESSAGES/glib20.mo +share/locale/da/LC_MESSAGES/glib20.mo share/locale/de/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo share/locale/es/LC_MESSAGES/glib20.mo +share/locale/et/LC_MESSAGES/glib20.mo share/locale/eu/LC_MESSAGES/glib20.mo +share/locale/fi/LC_MESSAGES/glib20.mo share/locale/fr/LC_MESSAGES/glib20.mo share/locale/gl/LC_MESSAGES/glib20.mo +share/locale/hi/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo +share/locale/mn/LC_MESSAGES/glib20.mo share/locale/ms/LC_MESSAGES/glib20.mo share/locale/nl/LC_MESSAGES/glib20.mo share/locale/nn/LC_MESSAGES/glib20.mo @@ -110,6 +117,7 @@ share/locale/ro/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/sq/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 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 9af2e61c9861..daa9d0eb2095 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.0.4.1 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.0 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,14 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomemimedata USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - BSD_PTHREAD_LIB=${PTHREAD_LIBS} + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + BSD_PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libgnomevfs/Makefile.in .include <bsd.port.mk> diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 1a127726ae2a..0c26e6bc9d66 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.0.4.1.tar.bz2) = 1d9ef5f9570268338512f9da1e6a8c6f +MD5 (gnome2/gnome-vfs-2.2.0.tar.bz2) = da9caa0a7d2793b99b13fd3ba7ba1391 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index aad92d16177f..b8b7c365ee84 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 13 09:10:52 2002 -+++ configure Wed Nov 13 10:46:27 2002 -@@ -5726,6 +5726,7 @@ +--- configure.orig Mon Jan 13 09:43:49 2003 ++++ configure Tue Jan 14 00:48:38 2003 +@@ -8122,6 +8122,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,40 +8,41 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9392,8 +9393,8 @@ +@@ -12680,8 +12681,8 @@ done fi --echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9397: checking for bzCompressInit in -lbz2" >&5 -+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9397: checking for BZ2_bzCompressInit in -lbz2" >&5 - ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9406,10 +9407,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ +-echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5 +-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5 ++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6 + if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12697,11 +12698,11 @@ + #endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit(); -+char BZ2_bzCompressInit(); - - int main() { --bzCompressInit() -+BZ2_bzCompressInit() - ; return 0; } - EOF - if { (eval echo configure:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -9704,7 +9705,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 + builtin and then its argument prototype would still apply. */ +-char bzCompressInit (); ++char BZ2_bzCompressInit (); + int + main () + { +-bzCompressInit (); ++BZ2_bzCompressInit (); + ; + return 0; + } +@@ -13245,7 +13246,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" - cat > conftest.$ac_ext <<EOF - #line 9710 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" #include "confdefs.h" -@@ -9739,9 +9740,9 @@ +@@ -13296,9 +13297,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -51,14 +52,14 @@ - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS="-lssl -lcryptofoo" fi - -@@ -10570,7 +10571,7 @@ - s%@ORBIT_IDL@%$ORBIT_IDL%g - s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g - s%@WARN_CFLAGS@%$WARN_CFLAGS%g --s%@PTHREAD_LIB@%$PTHREAD_LIB%g -+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g - s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g + +@@ -14894,7 +14895,7 @@ + s,@ORBIT_IDL@,$ORBIT_IDL,;t t + s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t + s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t +-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t ++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t + s,@USE_NLS@,$USE_NLS,;t t + s,@MSGFMT@,$MSGFMT,;t t diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab index 2b87972bc28a..3c0b987bbdb2 100644 --- a/devel/gnome-vfs/files/patch-ab +++ b/devel/gnome-vfs/files/patch-ab @@ -1,11 +1,10 @@ ---- Makefile.in.orig Wed Nov 13 10:46:51 2002 -+++ Makefile.in Wed Nov 13 10:47:52 2002 -@@ -170,7 +170,7 @@ +--- Makefile.in.orig Tue Jan 14 00:48:58 2003 ++++ Makefile.in Tue Jan 14 00:50:11 2003 +@@ -177,7 +177,6 @@ + schemas \ + devel-docs \ + doc \ +- test \ + monikers \ + po - SUBDIRS_GNOME = monikers doc schemas - --SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po -+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in index 7e959d704f4c..f9b09d46b7a3 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,5 +1,8 @@ ---- gnome-vfs-module-2.0.pc.in.orig Wed Jan 30 20:28:20 2002 -+++ gnome-vfs-module-2.0.pc.in Wed Nov 13 10:49:35 2002 + +$FreeBSD$ + +--- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 ++++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in index 1b09b31af872..6e6adc74537d 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in +++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in @@ -1,11 +1,11 @@ ---- libgnomevfs/Makefile.in.orig Wed Nov 13 10:51:57 2002 -+++ libgnomevfs/Makefile.in Wed Nov 13 10:52:09 2002 -@@ -192,7 +192,7 @@ - +--- libgnomevfs/Makefile.in.orig Tue Jan 14 00:50:29 2003 ++++ libgnomevfs/Makefile.in Tue Jan 14 00:51:03 2003 +@@ -341,7 +341,7 @@ + # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include -+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - ++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index c9cffae7aa99..39d34d5573fb 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,6 +1,14 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 17:01:22 2002 -+++ libgnomevfs/gnome-vfs-utils.c Sun May 5 17:02:24 2002 -@@ -774,7 +774,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Fri Dec 20 16:15:06 2002 ++++ libgnomevfs/gnome-vfs-utils.c Tue Jan 14 00:54:10 2003 +@@ -40,6 +40,7 @@ + #include <pwd.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +@@ -861,7 +862,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in b/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in deleted file mode 100644 index 05476dd54787..000000000000 --- a/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/Makefile.in.orig Wed Nov 13 11:05:45 2002 -+++ modules/vfolder/Makefile.in Wed Nov 13 11:06:24 2002 -@@ -221,7 +221,7 @@ - - - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. --LIBS = @LIBS@ -+LIBS = @LIBS@ @PTHREAD_LIB@ - libvfolder_desktop_la_DEPENDENCIES = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la - libvfolder_desktop_la_OBJECTS = vfolder-info.lo vfolder-util.lo \ diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c new file mode 100644 index 000000000000..a07d0bc81b39 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c @@ -0,0 +1,11 @@ +--- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 ++++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 +@@ -1721,7 +1721,7 @@ + + for (i = 0; ppath[i] != NULL; i++) { + dir = g_build_filename (ppath[i], +- "/share/applications/", ++ "/share/gnome/applications/", + NULL); + id = itemdir_new (info, + dir, diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 2635ed36573b..0de6103098c9 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -1,5 +1,3 @@ -etc/gconf/gconf.xml.defaults/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml @@ -8,11 +6,11 @@ etc/gconf/schemas/system_http_proxy.schemas etc/gnome-vfs-2.0/modules/default-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info +etc/gnome-vfs-2.0/vfolders/network.vfolder-info etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info -include/gnome-vfs-2.0/include/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h @@ -39,11 +37,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-magic.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h @@ -90,7 +85,98 @@ lib/vfs/2.0/extfs/zoo libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc -share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.html +share/doc/gnome-vfs-2.0/c9466.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/directory-operations.html +share/doc/gnome-vfs-2.0/everything-else.html +share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/writing-modules.html +share/doc/gnome-vfs-2.0/x27.html share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo @@ -107,6 +193,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo @@ -134,19 +221,13 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 -@dirrm lib/gnome-vfs-2.0/modules -@dirrm lib/gnome-vfs-2.0 @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 -@dirrm lib/vfs @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs -@dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 @dirrm etc/gnome-vfs-2.0/vfolders -@dirrm etc/gnome-vfs-2.0/modules -@dirrm etc/gnome-vfs-2.0 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/system @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 9af2e61c9861..daa9d0eb2095 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.0.4.1 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.0 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,14 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomemimedata USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - BSD_PTHREAD_LIB=${PTHREAD_LIBS} + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + BSD_PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libgnomevfs/Makefile.in .include <bsd.port.mk> diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 1a127726ae2a..0c26e6bc9d66 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.0.4.1.tar.bz2) = 1d9ef5f9570268338512f9da1e6a8c6f +MD5 (gnome2/gnome-vfs-2.2.0.tar.bz2) = da9caa0a7d2793b99b13fd3ba7ba1391 diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index aad92d16177f..b8b7c365ee84 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 13 09:10:52 2002 -+++ configure Wed Nov 13 10:46:27 2002 -@@ -5726,6 +5726,7 @@ +--- configure.orig Mon Jan 13 09:43:49 2003 ++++ configure Tue Jan 14 00:48:38 2003 +@@ -8122,6 +8122,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,40 +8,41 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9392,8 +9393,8 @@ +@@ -12680,8 +12681,8 @@ done fi --echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9397: checking for bzCompressInit in -lbz2" >&5 -+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9397: checking for BZ2_bzCompressInit in -lbz2" >&5 - ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9406,10 +9407,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ +-echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5 +-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5 ++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6 + if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12697,11 +12698,11 @@ + #endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit(); -+char BZ2_bzCompressInit(); - - int main() { --bzCompressInit() -+BZ2_bzCompressInit() - ; return 0; } - EOF - if { (eval echo configure:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -9704,7 +9705,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 + builtin and then its argument prototype would still apply. */ +-char bzCompressInit (); ++char BZ2_bzCompressInit (); + int + main () + { +-bzCompressInit (); ++BZ2_bzCompressInit (); + ; + return 0; + } +@@ -13245,7 +13246,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" - cat > conftest.$ac_ext <<EOF - #line 9710 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" #include "confdefs.h" -@@ -9739,9 +9740,9 @@ +@@ -13296,9 +13297,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -51,14 +52,14 @@ - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS="-lssl -lcryptofoo" fi - -@@ -10570,7 +10571,7 @@ - s%@ORBIT_IDL@%$ORBIT_IDL%g - s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g - s%@WARN_CFLAGS@%$WARN_CFLAGS%g --s%@PTHREAD_LIB@%$PTHREAD_LIB%g -+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g - s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g + +@@ -14894,7 +14895,7 @@ + s,@ORBIT_IDL@,$ORBIT_IDL,;t t + s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t + s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t +-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t ++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t + s,@USE_NLS@,$USE_NLS,;t t + s,@MSGFMT@,$MSGFMT,;t t diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab index 2b87972bc28a..3c0b987bbdb2 100644 --- a/devel/gnomevfs2/files/patch-ab +++ b/devel/gnomevfs2/files/patch-ab @@ -1,11 +1,10 @@ ---- Makefile.in.orig Wed Nov 13 10:46:51 2002 -+++ Makefile.in Wed Nov 13 10:47:52 2002 -@@ -170,7 +170,7 @@ +--- Makefile.in.orig Tue Jan 14 00:48:58 2003 ++++ Makefile.in Tue Jan 14 00:50:11 2003 +@@ -177,7 +177,6 @@ + schemas \ + devel-docs \ + doc \ +- test \ + monikers \ + po - SUBDIRS_GNOME = monikers doc schemas - --SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po -+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in index 7e959d704f4c..f9b09d46b7a3 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,5 +1,8 @@ ---- gnome-vfs-module-2.0.pc.in.orig Wed Jan 30 20:28:20 2002 -+++ gnome-vfs-module-2.0.pc.in Wed Nov 13 10:49:35 2002 + +$FreeBSD$ + +--- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 ++++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in index 1b09b31af872..6e6adc74537d 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in +++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in @@ -1,11 +1,11 @@ ---- libgnomevfs/Makefile.in.orig Wed Nov 13 10:51:57 2002 -+++ libgnomevfs/Makefile.in Wed Nov 13 10:52:09 2002 -@@ -192,7 +192,7 @@ - +--- libgnomevfs/Makefile.in.orig Tue Jan 14 00:50:29 2003 ++++ libgnomevfs/Makefile.in Tue Jan 14 00:51:03 2003 +@@ -341,7 +341,7 @@ + # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include -+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - ++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index c9cffae7aa99..39d34d5573fb 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,6 +1,14 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 17:01:22 2002 -+++ libgnomevfs/gnome-vfs-utils.c Sun May 5 17:02:24 2002 -@@ -774,7 +774,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Fri Dec 20 16:15:06 2002 ++++ libgnomevfs/gnome-vfs-utils.c Tue Jan 14 00:54:10 2003 +@@ -40,6 +40,7 @@ + #include <pwd.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +@@ -861,7 +862,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in b/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in deleted file mode 100644 index 05476dd54787..000000000000 --- a/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/Makefile.in.orig Wed Nov 13 11:05:45 2002 -+++ modules/vfolder/Makefile.in Wed Nov 13 11:06:24 2002 -@@ -221,7 +221,7 @@ - - - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. --LIBS = @LIBS@ -+LIBS = @LIBS@ @PTHREAD_LIB@ - libvfolder_desktop_la_DEPENDENCIES = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la - libvfolder_desktop_la_OBJECTS = vfolder-info.lo vfolder-util.lo \ diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c new file mode 100644 index 000000000000..a07d0bc81b39 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c @@ -0,0 +1,11 @@ +--- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 ++++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 +@@ -1721,7 +1721,7 @@ + + for (i = 0; ppath[i] != NULL; i++) { + dir = g_build_filename (ppath[i], +- "/share/applications/", ++ "/share/gnome/applications/", + NULL); + id = itemdir_new (info, + dir, diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 2635ed36573b..0de6103098c9 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -1,5 +1,3 @@ -etc/gconf/gconf.xml.defaults/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml @@ -8,11 +6,11 @@ etc/gconf/schemas/system_http_proxy.schemas etc/gnome-vfs-2.0/modules/default-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info +etc/gnome-vfs-2.0/vfolders/network.vfolder-info etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info -include/gnome-vfs-2.0/include/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h @@ -39,11 +37,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-magic.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h @@ -90,7 +85,98 @@ lib/vfs/2.0/extfs/zoo libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc -share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.html +share/doc/gnome-vfs-2.0/c9466.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/directory-operations.html +share/doc/gnome-vfs-2.0/everything-else.html +share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/writing-modules.html +share/doc/gnome-vfs-2.0/x27.html share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo @@ -107,6 +193,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo @@ -134,19 +221,13 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 -@dirrm lib/gnome-vfs-2.0/modules -@dirrm lib/gnome-vfs-2.0 @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 -@dirrm lib/vfs @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs -@dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 @dirrm etc/gnome-vfs-2.0/vfolders -@dirrm etc/gnome-vfs-2.0/modules -@dirrm etc/gnome-vfs-2.0 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/system @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 38eea056c723..54cd11625ec9 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gob2 PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 @@ -14,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile index ef24d0667882..9a0495394e25 100644 --- a/devel/libIDL/Makefile +++ b/devel/libIDL/Makefile @@ -7,6 +7,7 @@ PORTNAME= libIDL PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 @@ -14,11 +15,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -27,8 +30,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 66f514e93a23..00794e595390 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libbonobo -PORTVERSION= 2.0.1 +PORTVERSION= 2.2.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,6 +22,8 @@ USE_BISON= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -29,9 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ - s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' - .include <bsd.port.mk> diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 4336cdd2f3b2..ae18e5ce86fa 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1 +1 @@ -MD5 (gnome2/libbonobo-2.0.1.tar.bz2) = ef7b5d5621086b7ae9627960b52507fa +MD5 (gnome2/libbonobo-2.2.0.tar.bz2) = 4a17e033d67fa9ed353108a95670794b diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 85ad3d4256ef..9beb372763d6 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -40,6 +40,63 @@ lib/orbit-2.0/Bonobo_module.so libdata/bonobo/servers/Bonobo_Moniker_std.server libdata/bonobo/servers/Bonobo_Sample_Echo.server libdata/pkgconfig/libbonobo-2.0.pc +share/doc/libbonobo/debugging.html +share/doc/libbonobo/factories.html +share/doc/libbonobo/general.html +share/doc/libbonobo/home.png +share/doc/libbonobo/index.html +share/doc/libbonobo/index.sgml +share/doc/libbonobo/left.png +share/doc/libbonobo/libbonobo-bonobo-arg.html +share/doc/libbonobo/libbonobo-bonobo-config-database.html +share/doc/libbonobo/libbonobo-bonobo-context.html +share/doc/libbonobo/libbonobo-bonobo-event-source.html +share/doc/libbonobo/libbonobo-bonobo-exception.html +share/doc/libbonobo/libbonobo-bonobo-generic-factory.html +share/doc/libbonobo/libbonobo-bonobo-i18n.html +share/doc/libbonobo/libbonobo-bonobo-item-container.html +share/doc/libbonobo/libbonobo-bonobo-item-handler.html +share/doc/libbonobo/libbonobo-bonobo-listener.html +share/doc/libbonobo/libbonobo-bonobo-macros.html +share/doc/libbonobo/libbonobo-bonobo-main.html +share/doc/libbonobo/libbonobo-bonobo-moniker-context.html +share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html +share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html +share/doc/libbonobo/libbonobo-bonobo-moniker-util.html +share/doc/libbonobo/libbonobo-bonobo-moniker.html +share/doc/libbonobo/libbonobo-bonobo-object.html +share/doc/libbonobo/libbonobo-bonobo-persist-client.html +share/doc/libbonobo/libbonobo-bonobo-persist-file.html +share/doc/libbonobo/libbonobo-bonobo-persist-stream.html +share/doc/libbonobo/libbonobo-bonobo-persist.html +share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html +share/doc/libbonobo/libbonobo-bonobo-property-bag.html +share/doc/libbonobo/libbonobo-bonobo-running-context.html +share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html +share/doc/libbonobo/libbonobo-bonobo-shutdown.html +share/doc/libbonobo/libbonobo-bonobo-storage-memory.html +share/doc/libbonobo/libbonobo-bonobo-storage.html +share/doc/libbonobo/libbonobo-bonobo-stream-client.html +share/doc/libbonobo/libbonobo-bonobo-stream-memory.html +share/doc/libbonobo/libbonobo-bonobo-types.html +share/doc/libbonobo/libbonobo-bonobo-xobject.html +share/doc/libbonobo/libbonobo-faq.html +share/doc/libbonobo/libbonobo.devhelp +share/doc/libbonobo/misc.html +share/doc/libbonobo/monikers.html +share/doc/libbonobo/persist-file.png +share/doc/libbonobo/persist-storage.png +share/doc/libbonobo/persist-stream.png +share/doc/libbonobo/persist.html +share/doc/libbonobo/persist.png +share/doc/libbonobo/properties.html +share/doc/libbonobo/property-bags.html +share/doc/libbonobo/refcounting.html +share/doc/libbonobo/right.png +share/doc/libbonobo/storage.png +share/doc/libbonobo/stream.png +share/doc/libbonobo/streams.html +share/doc/libbonobo/up.png share/idl/bonobo-2.0/Bonobo.idl share/idl/bonobo-2.0/Bonobo_Canvas.idl share/idl/bonobo-2.0/Bonobo_Clipboard.idl @@ -58,22 +115,30 @@ share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl share/idl/bonobo-2.0/Bonobo_Storage.idl share/idl/bonobo-2.0/Bonobo_UI.idl share/idl/bonobo-2.0/Bonobo_Zoomable.idl +share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo +share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo +share/locale/da/LC_MESSAGES/libbonobo-2.0.mo +share/locale/de/LC_MESSAGES/libbonobo-2.0.mo share/locale/el/LC_MESSAGES/libbonobo-2.0.mo share/locale/es/LC_MESSAGES/libbonobo-2.0.mo +share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo +share/locale/he/LC_MESSAGES/libbonobo-2.0.mo share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo share/locale/it/LC_MESSAGES/libbonobo-2.0.mo share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo +share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo +share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo share/locale/no/LC_MESSAGES/libbonobo-2.0.mo share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo @@ -82,6 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo +share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 98deb4a32749..c606d5b68bcb 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libglade2 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 @@ -17,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat USE_BZIP2= yes @@ -26,13 +27,11 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_PYTHON= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist index 9581dd4b3a3a..26d93e2c2867 100644 --- a/devel/libglade2/pkg-plist +++ b/devel/libglade2/pkg-plist @@ -26,4 +26,3 @@ share/xml/libglade/glade-2.0.dtd @dirrm share/doc/libglade @dirrm include/libglade-2.0/glade @dirrm include/libglade-2.0 -@unexec /bin/rmdir %D/share/xml 2>/dev/null || /usr/bin/true diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index e7052e6a04cc..7b3941a708f6 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgsf -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.7 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index dab04be51e5b..22b7a7c76096 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgsf-1.6.0.tar.bz2) = 530c8c6ef9e919fb1a32f3d2993043f3 +MD5 (gnome2/libgsf-1.7.2.tar.bz2) = b89147bf49e5840f87f6f9b83a28e86d diff --git a/devel/libgsf/files/patch-configure b/devel/libgsf/files/patch-configure index 2c312dcc0109..de62becfec42 100644 --- a/devel/libgsf/files/patch-configure +++ b/devel/libgsf/files/patch-configure @@ -8,12 +8,3 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8279,7 +8280,7 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --need_posix=yes -+need_posix=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$saved_CFLAGS" diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 74642042def2..74a98ba07677 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -30,10 +30,10 @@ include/libgsf-1/gsf/gsf-utils.h include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.so -lib/libgsf-1.so.7 +lib/libgsf-1.so.8 lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.7 +lib/libgsf-gnome-1.so.8 libdata/pkgconfig/libgsf-1.pc libdata/pkgconfig/libgsf-gnome-1.pc share/doc/gsf/gsf-gsf-impl-utils.html diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 7e56f2815d5b..c437aea009a1 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgtop2 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 @@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_PERL5= yes |