diff options
32 files changed, 1 insertions, 1391 deletions
diff --git a/x11/Makefile b/x11/Makefile index 96110bfe108..02ff4787a68 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.502 2007/05/20 15:26:06 wiz Exp $ +# $NetBSD: Makefile,v 1.503 2007/05/20 17:28:17 wiz Exp $ # COMMENT= Packages to support the X window system @@ -51,7 +51,6 @@ SUBDIR+= gdm SUBDIR+= ggiterm SUBDIR+= glproto SUBDIR+= gnome-desktop -SUBDIR+= gnome-libs SUBDIR+= gnome-mag SUBDIR+= gnome-panel SUBDIR+= gnome-screensaver diff --git a/x11/gnome-libs/DESCR b/x11/gnome-libs/DESCR deleted file mode 100644 index 7b18635981d..00000000000 --- a/x11/gnome-libs/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -This package provides the libraries for GNOME. - -From the GNOME home page: - -GNOME stands for GNU Network Object Model Environment. The GNOME -project intends to build a complete, user-friendly desktop based -entirely on free software. GNOME is part of the GNU project, and -GNOME is part of the OpenSource(tm) movement. The desktop will -consist of small utilities and larger applications which share a -consistent look and feel. GNOME uses GTK+ as the GUI toolkit for all -GNOME-compliant applications. diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile deleted file mode 100644 index f5fc8cff228..00000000000 --- a/x11/gnome-libs/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# $NetBSD: Makefile,v 1.121 2007/01/09 08:31:17 joerg Exp $ - -DISTNAME= gnome-libs-1.4.2 -PKGREVISION= 6 -CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnome.org/ -COMMENT= Libraries for the GNU Network Object Model Environment - -PKG_INSTALLATION_TYPES= overwrite pkgviews - -BROKEN_GETTEXT_DETECTION= YES - -USE_DIRS+= gnome1-1.5 -USE_TOOLS+= gmake msgfmt -USE_LIBTOOL= YES - -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR:Q} \ - --enable-gtk-doc=no \ - --with-html-dir=${PREFIX}/share/doc/html \ - --with-kde-datadir=${X11PREFIX}/share/kde -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} -CONFIGURE_ENV+= ${CONFIGURE_ENV.db-${BDB_TYPE}} - -USE_PKGLOCALEDIR= YES - -LOCALSTATEDIR= ${VARBASE}/gnome -PLIST_SUBST+= LOCALSTATEDIR=${LOCALSTATEDIR:Q} - -SUBST_CLASSES+= varbase -SUBST_MESSAGE.varbase= Fixing path to score files. -SUBST_STAGE.varbase= post-patch -SUBST_FILES.varbase+= gnome-data/Makefile.in -SUBST_FILES.varbase+= libgnome/gnome-score.c -SUBST_SED.varbase= -e 's,@VARBASE@,${VARBASE},g' - -.include "../../audio/esound/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/imlib/buildlink3.mk" -.include "../../net/ORBit/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../mk/bdb.buildlink3.mk" - -CONFIGURE_ENV.db-${BDB_TYPE}?= ac_cv_func_dbopen=no -CONFIGURE_ENV.db-db1= # empty - -post-extract: -.for file in gnome-app-helper-convenience-macros.htm \ - gnome-app-helper-keybindings-config.htm - cd ${WRKSRC}/devel-docs/gnome-dev-info/gnome-dev-info && \ - ( [ -f ${file}l ] || ${MV} ${file} ${file}l ) -.endfor - -post-patch: - ${MV} ${WRKSRC}/gnome-config.in ${WRKSRC}/gnome-config.in-pre-lpath && \ - ${SED} -e "s|@LOCALBASE@|${LOCALBASE}|g" \ - < ${WRKSRC}/gnome-config.in-pre-lpath \ - > ${WRKSRC}/gnome-config.in - -pre-build: - cd ${WRKSRC}/support && \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} gnomesupport.h - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/etc/CORBA/servers - ${TOUCH} ${PREFIX}/etc/CORBA/servers/.directory - ${INSTALL_DATA_DIR} ${LOCALSTATEDIR} - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST deleted file mode 100644 index 2eac630e5e9..00000000000 --- a/x11/gnome-libs/PLIST +++ /dev/null @@ -1,581 +0,0 @@ -@comment $NetBSD: PLIST,v 1.18 2006/04/17 07:07:38 jlam Exp $ -bin/dns-helper -bin/gconfigger -bin/gnome-bug -bin/gnome-config -bin/gnome-dump-metadata -bin/gnome-gen-mimedb -bin/gnome-moz-remote -bin/gnome-name-service -bin/gnome_segv -bin/goad-browser -bin/libart-config -bin/loadshlib -bin/new-object -etc/CORBA/servers/.directory -etc/mime-magic -etc/mime-magic.dat -etc/paper.config -etc/sound/events/gnome.soundlist -etc/sound/events/gtk-events.soundlist -include/gnome-1.0/gnome.h -include/gnome-1.0/gtk-xmhtml/HTML.h -include/gnome-1.0/gtk-xmhtml/XmHTML.h -include/gnome-1.0/gtk-xmhtml/XmHTMLI.h -include/gnome-1.0/gtk-xmhtml/XmHTMLP.h -include/gnome-1.0/gtk-xmhtml/gtk-xmhtml-p.h -include/gnome-1.0/gtk-xmhtml/gtk-xmhtml.h -include/gnome-1.0/gtk-xmhtml/miniparse.h -include/gnome-1.0/gtk-xmhtml/toolkit.h -include/gnome-1.0/libart_lgpl/art_affine.h -include/gnome-1.0/libart_lgpl/art_alphagamma.h -include/gnome-1.0/libart_lgpl/art_bpath.h -include/gnome-1.0/libart_lgpl/art_config.h -include/gnome-1.0/libart_lgpl/art_filterlevel.h -include/gnome-1.0/libart_lgpl/art_gray_svp.h -include/gnome-1.0/libart_lgpl/art_misc.h -include/gnome-1.0/libart_lgpl/art_pathcode.h -include/gnome-1.0/libart_lgpl/art_pixbuf.h -include/gnome-1.0/libart_lgpl/art_point.h -include/gnome-1.0/libart_lgpl/art_rect.h -include/gnome-1.0/libart_lgpl/art_rect_svp.h -include/gnome-1.0/libart_lgpl/art_rect_uta.h -include/gnome-1.0/libart_lgpl/art_rgb.h -include/gnome-1.0/libart_lgpl/art_rgb_affine.h -include/gnome-1.0/libart_lgpl/art_rgb_bitmap_affine.h -include/gnome-1.0/libart_lgpl/art_rgb_pixbuf_affine.h -include/gnome-1.0/libart_lgpl/art_rgb_rgba_affine.h -include/gnome-1.0/libart_lgpl/art_rgb_svp.h -include/gnome-1.0/libart_lgpl/art_svp.h -include/gnome-1.0/libart_lgpl/art_svp_ops.h -include/gnome-1.0/libart_lgpl/art_svp_point.h -include/gnome-1.0/libart_lgpl/art_svp_render_aa.h -include/gnome-1.0/libart_lgpl/art_svp_vpath.h -include/gnome-1.0/libart_lgpl/art_svp_vpath_stroke.h -include/gnome-1.0/libart_lgpl/art_svp_wind.h -include/gnome-1.0/libart_lgpl/art_uta.h -include/gnome-1.0/libart_lgpl/art_uta_ops.h -include/gnome-1.0/libart_lgpl/art_uta_rect.h -include/gnome-1.0/libart_lgpl/art_uta_svp.h -include/gnome-1.0/libart_lgpl/art_uta_vpath.h -include/gnome-1.0/libart_lgpl/art_vpath.h -include/gnome-1.0/libart_lgpl/art_vpath_bpath.h -include/gnome-1.0/libart_lgpl/art_vpath_dash.h -include/gnome-1.0/libart_lgpl/art_vpath_svp.h -include/gnome-1.0/libart_lgpl/libart-features.h -include/gnome-1.0/libart_lgpl/libart.h -include/gnome-1.0/libgnome/gnome-config.h -include/gnome-1.0/libgnome/gnome-defs.h -include/gnome-1.0/libgnome/gnome-dentry.h -include/gnome-1.0/libgnome/gnome-exec.h -include/gnome-1.0/libgnome/gnome-fileconvert.h -include/gnome-1.0/libgnome/gnome-help.h -include/gnome-1.0/libgnome/gnome-history.h -include/gnome-1.0/libgnome/gnome-i18n.h -include/gnome-1.0/libgnome/gnome-magic.h -include/gnome-1.0/libgnome/gnome-metadata.h -include/gnome-1.0/libgnome/gnome-mime-info.h -include/gnome-1.0/libgnome/gnome-mime.h -include/gnome-1.0/libgnome/gnome-paper.h -include/gnome-1.0/libgnome/gnome-popt.h -include/gnome-1.0/libgnome/gnome-regex.h -include/gnome-1.0/libgnome/gnome-remote.h -include/gnome-1.0/libgnome/gnome-score.h -include/gnome-1.0/libgnome/gnome-sound.h -include/gnome-1.0/libgnome/gnome-triggers.h -include/gnome-1.0/libgnome/gnome-url.h -include/gnome-1.0/libgnome/gnome-util.h -include/gnome-1.0/libgnome/libgnome.h -include/gnome-1.0/libgnomeui/gnome-about.h -include/gnome-1.0/libgnomeui/gnome-animator.h -include/gnome-1.0/libgnomeui/gnome-app-helper.h -include/gnome-1.0/libgnomeui/gnome-app-util.h -include/gnome-1.0/libgnomeui/gnome-app.h -include/gnome-1.0/libgnomeui/gnome-appbar.h -include/gnome-1.0/libgnomeui/gnome-calculator.h -include/gnome-1.0/libgnomeui/gnome-canvas-image.h -include/gnome-1.0/libgnomeui/gnome-canvas-line.h -include/gnome-1.0/libgnomeui/gnome-canvas-load.h -include/gnome-1.0/libgnomeui/gnome-canvas-polygon.h -include/gnome-1.0/libgnomeui/gnome-canvas-rect-ellipse.h -include/gnome-1.0/libgnomeui/gnome-canvas-text.h -include/gnome-1.0/libgnomeui/gnome-canvas-util.h -include/gnome-1.0/libgnomeui/gnome-canvas-widget.h -include/gnome-1.0/libgnomeui/gnome-canvas.h -include/gnome-1.0/libgnomeui/gnome-client.h -include/gnome-1.0/libgnomeui/gnome-color-picker.h -include/gnome-1.0/libgnomeui/gnome-compat.h -include/gnome-1.0/libgnomeui/gnome-dateedit.h -include/gnome-1.0/libgnomeui/gnome-dentry-edit.h -include/gnome-1.0/libgnomeui/gnome-dialog-util.h -include/gnome-1.0/libgnomeui/gnome-dialog.h -include/gnome-1.0/libgnomeui/gnome-dns.h -include/gnome-1.0/libgnomeui/gnome-dock-band.h -include/gnome-1.0/libgnomeui/gnome-dock-item.h -include/gnome-1.0/libgnomeui/gnome-dock-layout.h -include/gnome-1.0/libgnomeui/gnome-dock.h -include/gnome-1.0/libgnomeui/gnome-druid-page-finish.h -include/gnome-1.0/libgnomeui/gnome-druid-page-standard.h -include/gnome-1.0/libgnomeui/gnome-druid-page-start.h -include/gnome-1.0/libgnomeui/gnome-druid-page.h -include/gnome-1.0/libgnomeui/gnome-druid.h -include/gnome-1.0/libgnomeui/gnome-entry.h -include/gnome-1.0/libgnomeui/gnome-file-entry.h -include/gnome-1.0/libgnomeui/gnome-font-picker.h -include/gnome-1.0/libgnomeui/gnome-font-selector.h -include/gnome-1.0/libgnomeui/gnome-geometry.h -include/gnome-1.0/libgnomeui/gnome-guru.h -include/gnome-1.0/libgnomeui/gnome-href.h -include/gnome-1.0/libgnomeui/gnome-ice.h -include/gnome-1.0/libgnomeui/gnome-icon-entry.h -include/gnome-1.0/libgnomeui/gnome-icon-item.h -include/gnome-1.0/libgnomeui/gnome-icon-list.h -include/gnome-1.0/libgnomeui/gnome-icon-sel.h -include/gnome-1.0/libgnomeui/gnome-icon-text.h -include/gnome-1.0/libgnomeui/gnome-init.h -include/gnome-1.0/libgnomeui/gnome-less.h -include/gnome-1.0/libgnomeui/gnome-mdi-child.h -include/gnome-1.0/libgnomeui/gnome-mdi-generic-child.h -include/gnome-1.0/libgnomeui/gnome-mdi-session.h -include/gnome-1.0/libgnomeui/gnome-mdi.h -include/gnome-1.0/libgnomeui/gnome-messagebox.h -include/gnome-1.0/libgnomeui/gnome-number-entry.h -include/gnome-1.0/libgnomeui/gnome-paper-selector.h -include/gnome-1.0/libgnomeui/gnome-pixmap-entry.h -include/gnome-1.0/libgnomeui/gnome-pixmap.h -include/gnome-1.0/libgnomeui/gnome-popup-help.h -include/gnome-1.0/libgnomeui/gnome-popup-menu.h -include/gnome-1.0/libgnomeui/gnome-preferences.h -include/gnome-1.0/libgnomeui/gnome-procbar.h -include/gnome-1.0/libgnomeui/gnome-properties.h -include/gnome-1.0/libgnomeui/gnome-property-entries.h -include/gnome-1.0/libgnomeui/gnome-propertybox.h -include/gnome-1.0/libgnomeui/gnome-scores.h -include/gnome-1.0/libgnomeui/gnome-spell.h -include/gnome-1.0/libgnomeui/gnome-startup.h -include/gnome-1.0/libgnomeui/gnome-stock.h -include/gnome-1.0/libgnomeui/gnome-types.h -include/gnome-1.0/libgnomeui/gnome-uidefs.h -include/gnome-1.0/libgnomeui/gnome-window-icon.h -include/gnome-1.0/libgnomeui/gnome-window.h -include/gnome-1.0/libgnomeui/gnome-winhints.h -include/gnome-1.0/libgnomeui/gnometypebuiltins.h -include/gnome-1.0/libgnomeui/gtk-clock.h -include/gnome-1.0/libgnomeui/gtk-ted.h -include/gnome-1.0/libgnomeui/gtkcauldron.h -include/gnome-1.0/libgnomeui/gtkdial.h -include/gnome-1.0/libgnomeui/gtkpixmapmenuitem.h -include/gnome-1.0/libgnomeui/libgnomeui.h -include/gnome-1.0/libgnorba/Table.h -include/gnome-1.0/libgnorba/gnome-factory.h -include/gnome-1.0/libgnorba/gnome-unknown.h -include/gnome-1.0/libgnorba/gnorba.h -include/gnome-1.0/popt-gnome.h -include/gnome-1.0/zvt/lists.h -include/gnome-1.0/zvt/vt.h -include/gnome-1.0/zvt/vtx.h -include/gnome-1.0/zvt/zvtterm.h -lib/gnome-libs/include/gnomesupport.h -lib/gnomeConf.sh -lib/libartConf.sh -lib/libart_lgpl.la -lib/libgnome.la -lib/libgnomesupport.la -lib/libgnomeui.la -lib/libgnorba.la -lib/libgnorbagtk.la -lib/libgtkxmhtml.la -lib/libzvt.la -man/man1/dns-helper.1 -man/man1/gconfigger.1 -man/man1/gnome-bug.1 -man/man1/gnome-config.1 -man/man1/gnome-doc.1 -man/man1/gnome-dump-metadata.1 -man/man1/gnome-gen-mimedb.1 -man/man1/gnome-mkstub.1 -man/man1/gnome-moz-remote.1 -man/man1/gnome-name-service.1 -man/man1/gnome-pty-helper.1 -man/man1/gnome.1 -man/man1/gnome_segv.1 -man/man1/goad-browser.1 -man/man1/libart-config.1 -man/man1/loadshlib.1 -man/man1/new-object.1 -man/man5/gnome-mime.5 -sbin/gnome-pty-helper -share/aclocal/libart.m4 -share/doc/gnome-libs/README.gtkcauldron -share/doc/gnome-libs/README.gtkcauldron_for_python -share/doc/gnome-libs/adding-file-manager-new-items.txt -share/doc/gnome-libs/adding-sounds.txt -share/doc/gnome-libs/api-comment-style.txt -share/doc/gnome-libs/gnome-doc -share/doc/gnome-libs/gnome-doc.1 -share/doc/gnome-libs/gnome-doc.el -share/doc/gnome-libs/gnome-mkstub.1 -share/doc/gnome-libs/gtk_dialog_cauldron.3 -share/doc/gnome-libs/mime-type-handling.txt -share/doc/gnome-libs/mkstub -share/doc/gnome-libs/session-management.txt -share/doc/gnome-libs/suggestions.txt -share/doc/html/libart/basic-foo.html -share/doc/html/libart/basic-rendering.html -share/doc/html/libart/basic.html -share/doc/html/libart/fdl-section1.html -share/doc/html/libart/fdl-section10.html -share/doc/html/libart/fdl-section2.html -share/doc/html/libart/fdl-section3.html -share/doc/html/libart/fdl-section4.html -share/doc/html/libart/fdl-section5.html -share/doc/html/libart/fdl-section6.html -share/doc/html/libart/fdl-section7.html -share/doc/html/libart/fdl-section8.html -share/doc/html/libart/fdl-section9.html -share/doc/html/libart/fdl-using.html -share/doc/html/libart/fdl.html -share/doc/html/libart/internals-intersector.html -share/doc/html/libart/internals.html -share/doc/html/libart/intro-file-names.html -share/doc/html/libart/intro.html -share/doc/html/libart/libart-affine-transformation-matrices.html -share/doc/html/libart/libart-art-alpha-gamma-stuff.html -share/doc/html/libart/libart-core-construction-apis.html -share/doc/html/libart/libart-extended-construction-apis.html -share/doc/html/libart/libart-memory-management.html -share/doc/html/libart/libart-svp-rendering.html -share/doc/html/libart/libart-svps.html -share/doc/html/libart/libart-transformation-operations.html -share/doc/html/libart/libart.html -share/doc/html/libart/problems-memory.html -share/doc/html/libart/problems.html -share/doc/html/libart/sample-display.html -share/doc/html/libart/sample.html -share/doc/html/libart/x35.html -share/gnome/help/gnome-dev-info/C/addauth.html -share/gnome/help/gnome-dev-info/C/altpol.html -share/gnome/help/gnome-dev-info/C/arch.html -share/gnome/help/gnome-dev-info/C/book1.html -share/gnome/help/gnome-dev-info/C/codstd.html -share/gnome/help/gnome-dev-info/C/cvs.html -share/gnome/help/gnome-dev-info/C/dialogapputil-docs.html -share/gnome/help/gnome-dev-info/C/event-driven-programming.html -share/gnome/help/gnome-dev-info/C/gnome-actionarea.html -share/gnome/help/gnome-dev-info/C/gnome-app-helper-convenience-macros.html -share/gnome/help/gnome-dev-info/C/gnome-app-helper-functions.html -share/gnome/help/gnome-dev-info/C/gnome-app-helper-gnomeuiinfo.html -share/gnome/help/gnome-dev-info/C/gnome-app-helper-keybindings-config.html -share/gnome/help/gnome-dev-info/C/gnome-app-helper-quick-example.html -share/gnome/help/gnome-dev-info/C/gnome-app-helper.html -share/gnome/help/gnome-dev-info/C/gnome-app-util.html -share/gnome/help/gnome-dev-info/C/gnome-app.html -share/gnome/help/gnome-dev-info/C/gnome-canvas-coordinates.html -share/gnome/help/gnome-dev-info/C/gnome-canvas-getting-started.html -share/gnome/help/gnome-dev-info/C/gnome-canvas-object-arguments.html -share/gnome/help/gnome-dev-info/C/gnome-canvas-organization-of-items.html -share/gnome/help/gnome-dev-info/C/gnome-canvas.html -share/gnome/help/gnome-dev-info/C/gnome-client.html -share/gnome/help/gnome-dev-info/C/gnome-color-selector.html -share/gnome/help/gnome-dev-info/C/gnome-defs.html -share/gnome/help/gnome-dev-info/C/gnome-dentry.html -share/gnome/help/gnome-dev-info/C/gnome-dialog.html -share/gnome/help/gnome-dev-info/C/gnome-dns.html -share/gnome/help/gnome-dev-info/C/gnome-fileconvert.html -share/gnome/help/gnome-dev-info/C/gnome-font-selector.html -share/gnome/help/gnome-dev-info/C/gnome-help.html -share/gnome/help/gnome-dev-info/C/gnome-history.html -share/gnome/help/gnome-dev-info/C/gnome-hook.html -share/gnome/help/gnome-dev-info/C/gnome-i18n.html -share/gnome/help/gnome-dev-info/C/gnome-ice.html -share/gnome/help/gnome-dev-info/C/gnome-mdi-docs.html -share/gnome/help/gnome-dev-info/C/gnome-messagebox.html -share/gnome/help/gnome-dev-info/C/gnome-mime.html -share/gnome/help/gnome-dev-info/C/gnome-net.html -share/gnome/help/gnome-dev-info/C/gnome-pixmap.html -share/gnome/help/gnome-dev-info/C/gnome-plugins.html -share/gnome/help/gnome-dev-info/C/gnome-properties.html -share/gnome/help/gnome-dev-info/C/gnome-score.html -share/gnome/help/gnome-dev-info/C/gnome-scores.html -share/gnome/help/gnome-dev-info/C/gnome-session.html -share/gnome/help/gnome-dev-info/C/gnome-startup.html -share/gnome/help/gnome-dev-info/C/gnome-stock-imlib.html -share/gnome/help/gnome-dev-info/C/gnome-stock-xpm.html -share/gnome/help/gnome-dev-info/C/gnome-stock.html -share/gnome/help/gnome-dev-info/C/gnome-string.html -share/gnome/help/gnome-dev-info/C/gnome-triggers.html -share/gnome/help/gnome-dev-info/C/gnome-util.html -share/gnome/help/gnome-dev-info/C/gnomeappbar.html -share/gnome/help/gnome-dev-info/C/graphics-contexts.html -share/gnome/help/gnome-dev-info/C/gtk-clock.html -share/gnome/help/gnome-dev-info/C/gtk-ted.html -share/gnome/help/gnome-dev-info/C/intro.html -share/gnome/help/gnome-dev-info/C/libgnome.html -share/gnome/help/gnome-dev-info/C/libgnomeui.html -share/gnome/help/gnome-dev-info/C/libgnorba-docs.html -share/gnome/help/gnome-dev-info/C/ln14.html -share/gnome/help/gnome-dev-info/C/nontech.html -share/gnome/help/gnome-dev-info/C/orbitgtk.html -share/gnome/help/gnome-dev-info/C/start.html -share/gnome/help/gnome-dev-info/C/thisdoc.html -share/gnome/help/gnome-dev-info/C/tut-doc.html -share/gnome/help/gnome-dev-info/C/tut-i18n.html -share/gnome/help/gnome-dev-info/C/tut-menus.html -share/gnome/help/gnome-dev-info/C/tut-parsing.html -share/gnome/help/gnome-dev-info/C/tut-sm.html -share/gnome/help/gnome-dev-info/C/tutorial.html -share/gnome/help/gnome-dev-info/C/visuals.html -share/gnome/help/gnome-dev-info/C/what.html -share/gnome/help/gnome-dev-info/C/whatis.html -share/gnome/help/gnome-dev-info/C/x-concepts-docs.html -share/gnome/help/gnome-dev-info/C/x1453.html -share/gnome/help/gnome-dev-info/C/x2161.html -share/gnome/help/gnome-dev-info/C/x2674.html -share/gnome/help/gnome-dev-info/C/x671.html -share/gnome/html/gnome-decl.txt -share/gnome/html/gnome-sections.txt -share/gnome/html/gnome.html -share/gnome/html/gnome/book1.html -share/gnome/html/gnome/gnome-gnome-config.html -share/gnome/html/gnome/gnome-gnome-defs.html -share/gnome/html/gnome/gnome-gnome-dentry.html -share/gnome/html/gnome/gnome-gnome-exec.html -share/gnome/html/gnome/gnome-gnome-fileconvert.html -share/gnome/html/gnome/gnome-gnome-help.html -share/gnome/html/gnome/gnome-gnome-history.html -share/gnome/html/gnome/gnome-gnome-i18n.html -share/gnome/html/gnome/gnome-gnome-metadata.html -share/gnome/html/gnome/gnome-gnome-mime-info.html -share/gnome/html/gnome/gnome-gnome-mime.html -share/gnome/html/gnome/gnome-gnome-paper.html -share/gnome/html/gnome/gnome-gnome-popt.html -share/gnome/html/gnome/gnome-gnome-regex.html -share/gnome/html/gnome/gnome-gnome-remote.html -share/gnome/html/gnome/gnome-gnome-score.html -share/gnome/html/gnome/gnome-gnome-sound.html -share/gnome/html/gnome/gnome-gnome-triggers.html -share/gnome/html/gnome/gnome-gnome-url.html -share/gnome/html/gnome/gnome-gnome-util.html -share/gnome/html/gnome/gnome-libgnome.html -share/gnome/html/gnome/libgnome.html -share/gnome/html/gnomeui-decl.txt -share/gnome/html/gnomeui-sections.txt -share/gnome/html/gnomeui.hierarchy -share/gnome/html/gnomeui.html -share/gnome/html/gnomeui.types -share/gnome/html/gnomeui/book1.html -share/gnome/html/gnomeui/gnome-objects.html -share/gnome/html/gnomeui/gnomeabout.html -share/gnome/html/gnomeui/gnomeanimator.html -share/gnome/html/gnomeui/gnomeapp.html -share/gnome/html/gnomeui/gnomeappbar.html -share/gnome/html/gnomeui/gnomecalculator.html -share/gnome/html/gnomeui/gnomecanvas.html -share/gnome/html/gnomeui/gnomecanvasellipse.html -share/gnome/html/gnomeui/gnomecanvasgroup.html -share/gnome/html/gnomeui/gnomecanvasimage.html -share/gnome/html/gnomeui/gnomecanvasitem.html -share/gnome/html/gnomeui/gnomecanvasline.html -share/gnome/html/gnomeui/gnomecanvaspolygon.html -share/gnome/html/gnomeui/gnomecanvasre.html -share/gnome/html/gnomeui/gnomecanvasrect.html -share/gnome/html/gnomeui/gnomecanvastext.html -share/gnome/html/gnomeui/gnomecanvaswidget.html -share/gnome/html/gnomeui/gnomeclient.html -share/gnome/html/gnomeui/gnomecolorpicker.html -share/gnome/html/gnomeui/gnomedateedit.html -share/gnome/html/gnomeui/gnomedentryedit.html -share/gnome/html/gnomeui/gnomedialog.html -share/gnome/html/gnomeui/gnomedock.html -share/gnome/html/gnomeui/gnomedockband.html -share/gnome/html/gnomeui/gnomedockitem.html -share/gnome/html/gnomeui/gnomedocklayout.html -share/gnome/html/gnomeui/gnomedruid.html -share/gnome/html/gnomeui/gnomedruidpage.html -share/gnome/html/gnomeui/gnomedruidpagefinish.html -share/gnome/html/gnomeui/gnomedruidpagestandard.html -share/gnome/html/gnomeui/gnomedruidpagestart.html -share/gnome/html/gnomeui/gnomeentry.html -share/gnome/html/gnomeui/gnomefileentry.html -share/gnome/html/gnomeui/gnomefontpicker.html -share/gnome/html/gnomeui/gnomefontselector.html -share/gnome/html/gnomeui/gnomehref.html -share/gnome/html/gnomeui/gnomeiconentry.html -share/gnome/html/gnomeui/gnomeiconlist.html -share/gnome/html/gnomeui/gnomeiconselection.html -share/gnome/html/gnomeui/gnomeicontextitem.html -share/gnome/html/gnomeui/gnomeless.html -share/gnome/html/gnomeui/gnomemdi.html -share/gnome/html/gnomeui/gnomemdichild.html -share/gnome/html/gnomeui/gnomemdigenericchild.html -share/gnome/html/gnomeui/gnomemessagebox.html -share/gnome/html/gnomeui/gnomenumberentry.html -share/gnome/html/gnomeui/gnomepaperselector.html -share/gnome/html/gnomeui/gnomepixmap.html -share/gnome/html/gnomeui/gnomepixmapentry.html -share/gnome/html/gnomeui/gnomeprocbar.html -share/gnome/html/gnomeui/gnomepropertybox.html -share/gnome/html/gnomeui/gnomescores.html -share/gnome/html/gnomeui/gnomespell.html -share/gnome/html/gnomeui/gnomestock.html -share/gnome/html/gnomeui/gnomeui-gnome-app-helper.html -share/gnome/html/gnomeui/gnomeui-gnome-app-util.html -share/gnome/html/gnomeui/gnomeui-gnome-canvas-util.html -share/gnome/html/gnomeui/gnomeui-gnome-dialog-util.html -share/gnome/html/gnomeui/gnomeui-gnome-dns.html -share/gnome/html/gnomeui/gnomeui-gnome-geometry.html -share/gnome/html/gnomeui/gnomeui-gnome-ice.html -share/gnome/html/gnomeui/gnomeui-gnome-icon-text.html -share/gnome/html/gnomeui/gnomeui-gnome-init.html -share/gnome/html/gnomeui/gnomeui-gnome-mdi-session.html -share/gnome/html/gnomeui/gnomeui-gnome-popup-help.html -share/gnome/html/gnomeui/gnomeui-gnome-popup-menu.html -share/gnome/html/gnomeui/gnomeui-gnome-preferences.html -share/gnome/html/gnomeui/gnomeui-gnome-properties.html -share/gnome/html/gnomeui/gnomeui-gnome-property-entries.html -share/gnome/html/gnomeui/gnomeui-gnome-startup.html -share/gnome/html/gnomeui/gnomeui-gnome-types.html -share/gnome/html/gnomeui/gnomeui-gnome-uidefs.html -share/gnome/html/gnomeui/gnomeui-gnome-window-icon.html -share/gnome/html/gnomeui/gnomeui-gnome-winhints.html -share/gnome/html/gnomeui/gnomeui-gtkcauldron.html -share/gnome/html/gnomeui/gtkclock.html -share/gnome/html/gnomeui/gtkdial.html -share/gnome/html/gnomeui/gtkpixmapmenuitem.html -share/gnome/html/gnomeui/gtkted.html -share/gnome/html/gnomeui/libgnomeui.html -share/gnome/html/gnorba-decl.txt -share/gnome/html/gnorba-sections.txt -share/gnome/html/gnorba/book1.html -share/gnome/html/gnorba/gnorba-gnorba.html -share/gnome/html/gnorba/gnorba-goad.html -share/gnome/html/gnorba/libgnorba.html -share/gnome/html/zvt-decl.txt -share/gnome/html/zvt-sections.txt -share/gnome/html/zvt/book1.html -share/gnome/html/zvt/x1035.html -share/gnome/html/zvt/x1065.html -share/gnome/html/zvt/x1086.html -share/gnome/html/zvt/x1106.html -share/gnome/html/zvt/x119.html -share/gnome/html/zvt/x98.html -share/gnome/html/zvt/x987.html -share/gnome/html/zvt/x995.html -share/gnome/html/zvt/zvt-zvtterm.html -share/gnome/html/zvt/zvtterm-future.html -share/gnome/html/zvt/zvtterm-input-output.html -share/gnome/html/zvt/zvtterm-notes.html -share/gnome/html/zvt/zvtterm-properties.html -share/gnome/html/zvt/zvtterm-reference.html -share/gnome/html/zvt/zvtterm-window-hints.html -share/gnome/html/zvt/zvtterm.html -share/gnome/html/zvtterm.html -share/gtkrc -share/gtkrc.el -share/gtkrc.eo -share/gtkrc.he -share/gtkrc.hy -share/gtkrc.iso88592 -share/gtkrc.iso88595 -share/gtkrc.ja -share/gtkrc.ka_GE.georgianacademy -share/gtkrc.ka_GE.georgianps -share/gtkrc.ko -share/gtkrc.ru -share/gtkrc.th -share/gtkrc.tr -share/gtkrc.uk -share/gtkrc.vi_VN.tcvn -share/gtkrc.vi_VN.viscii -share/gtkrc.zh_CN -share/gtkrc.zh_TW.Big5 -share/idl/GnomeObject.idl -share/idl/Table.idl -share/idl/desktop-editor.idl -share/idl/desktop-textviewer.idl -share/idl/gnome-factory.idl -share/idl/gnome-unknown.idl -share/idl/name-service.idl -share/locale/az/LC_MESSAGES/gnome-libs.mo -share/locale/ca/LC_MESSAGES/gnome-libs.mo -share/locale/cs/LC_MESSAGES/gnome-libs.mo -share/locale/da/LC_MESSAGES/gnome-libs.mo -share/locale/de/LC_MESSAGES/gnome-libs.mo -share/locale/el/LC_MESSAGES/gnome-libs.mo -share/locale/en_GB/LC_MESSAGES/gnome-libs.mo -share/locale/es/LC_MESSAGES/gnome-libs.mo -share/locale/et/LC_MESSAGES/gnome-libs.mo -share/locale/eu/LC_MESSAGES/gnome-libs.mo -share/locale/fi/LC_MESSAGES/gnome-libs.mo -share/locale/fr/LC_MESSAGES/gnome-libs.mo -share/locale/ga/LC_MESSAGES/gnome-libs.mo -share/locale/gl/LC_MESSAGES/gnome-libs.mo -share/locale/hr/LC_MESSAGES/gnome-libs.mo -share/locale/hu/LC_MESSAGES/gnome-libs.mo -share/locale/it/LC_MESSAGES/gnome-libs.mo -share/locale/ja/LC_MESSAGES/gnome-libs.mo -share/locale/ko/LC_MESSAGES/gnome-libs.mo -share/locale/lt/LC_MESSAGES/gnome-libs.mo -share/locale/lv/LC_MESSAGES/gnome-libs.mo -share/locale/ms/LC_MESSAGES/gnome-libs.mo -share/locale/nl/LC_MESSAGES/gnome-libs.mo -share/locale/nn/LC_MESSAGES/gnome-libs.mo -share/locale/no/LC_MESSAGES/gnome-libs.mo -share/locale/pl/LC_MESSAGES/gnome-libs.mo -share/locale/pt/LC_MESSAGES/gnome-libs.mo -share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo -share/locale/ro/LC_MESSAGES/gnome-libs.mo -share/locale/ru/LC_MESSAGES/gnome-libs.mo -share/locale/sk/LC_MESSAGES/gnome-libs.mo -share/locale/sl/LC_MESSAGES/gnome-libs.mo -share/locale/sp/LC_MESSAGES/gnome-libs.mo -share/locale/sr/LC_MESSAGES/gnome-libs.mo -share/locale/sv/LC_MESSAGES/gnome-libs.mo -share/locale/ta/LC_MESSAGES/gnome-libs.mo -share/locale/tr/LC_MESSAGES/gnome-libs.mo -share/locale/uk/LC_MESSAGES/gnome-libs.mo -share/locale/vi/LC_MESSAGES/gnome-libs.mo -share/locale/wa/LC_MESSAGES/gnome-libs.mo -share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo -share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo -share/mime-info/gnome.mime -share/pixmaps/calculator-font.png -share/pixmaps/gnome1-default-dlg.png -share/pixmaps/gnome1-error.png -share/pixmaps/gnome1-info.png -share/pixmaps/gnome1-question.png -share/pixmaps/gnome1-warning.png -share/pixmaps/no.xpm -share/pixmaps/yes.xpm -share/type-convert/gnome-make-postscript-mimes -share/type-convert/postscript.convert -share/type-convert/type.convert -@dirrm share/type-convert -@comment in gnome-dirs: @dirrm share/mime-info -@unexec ${RMDIR} %D/share/gnome/html/zvt 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/html/gnorba 2>/dev/null || ${TRUE} -@dirrm share/gnome/html/gnomeui -@dirrm share/gnome/html/gnome -@dirrm share/gnome/html -@dirrm share/gnome/help/gnome-dev-info/C -@dirrm share/gnome/help/gnome-dev-info -@comment in gnome1-dirs: @dirrm share/gnome/help -@comment in gnome1-dirs: @dirrm share/gnome/apps -@comment in gnome1-dirs: @dirrm share/gnome -@dirrm share/doc/html/libart -@dirrm share/doc/gnome-libs -@dirrm lib/gnome-libs/include -@dirrm lib/gnome-libs -@dirrm include/gnome-1.0/zvt -@dirrm include/gnome-1.0/libgnorba -@dirrm include/gnome-1.0/libgnomeui -@dirrm include/gnome-1.0/libgnome -@dirrm include/gnome-1.0/libart_lgpl -@dirrm include/gnome-1.0/gtk-xmhtml -@dirrm include/gnome-1.0 -@unexec ${RMDIR} %D/etc/sound/events 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/etc/sound 2>/dev/null || ${TRUE} -@dirrm etc/CORBA/servers -@dirrm etc/CORBA -@exec ${MKDIR} ${LOCALSTATEDIR} -@unexec ${RM} -rf ${LOCALSTATEDIR} diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk deleted file mode 100644 index 28bb91d44b2..00000000000 --- a/x11/gnome-libs/buildlink3.mk +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/01/31 13:20:26 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_LIBS_BUILDLINK3_MK:= ${GNOME_LIBS_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-libs -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-libs} -BUILDLINK_PACKAGES+= gnome-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-libs - -.if !empty(GNOME_LIBS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb1 -BUILDLINK_ABI_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb6 -BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs -.endif # GNOME_LIBS_BUILDLINK3_MK - -.include "../../audio/esound/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/imlib/buildlink3.mk" -.include "../../net/ORBit/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../mk/bdb.buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo deleted file mode 100644 index f7ea10be62c..00000000000 --- a/x11/gnome-libs/distinfo +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: distinfo,v 1.21 2005/11/25 14:40:44 kristerw Exp $ - -SHA1 (gnome-libs-1.4.2.tar.gz) = 9925d28237f0269a2678fdcfa7ec6033dab04789 -RMD160 (gnome-libs-1.4.2.tar.gz) = 00e2dc66c0ec35a7ae62faab84d3ff2720099d76 -Size (gnome-libs-1.4.2.tar.gz) = 3781173 bytes -SHA1 (patch-aa) = bcc6ba3d4375a38fe8b515725aff4903e6df1be7 -SHA1 (patch-ab) = 9962993088a5adc43350f671868a54085938f089 -SHA1 (patch-ac) = 601cb8850ab9497fb9ab25843d1e9fd47306256e -SHA1 (patch-ad) = 10e46c8965137c8c0a3acf177898ca07fb4c90fa -SHA1 (patch-ae) = 85e0395394602628b4bec63ac0e96a31bacc9f10 -SHA1 (patch-af) = a5aea708fe8b46c421f818cab8dc033a2c224831 -SHA1 (patch-ag) = 7cc30aa025384c4d0c2d7250f0e6c6aa39c469b7 -SHA1 (patch-ah) = d0725757c6132e777c7d5d45453c7a744b51de2f -SHA1 (patch-ai) = 62dacbca23cfb8f5a67904ce87a2ad864f5d0ea0 -SHA1 (patch-aj) = 292c4efccc9650c8244348bdcf22c3c1cbd3ebe6 -SHA1 (patch-ak) = fa6f2db6faff3ca6427784b84acf5856be24af82 -SHA1 (patch-al) = 9aa030c76a8f9a0975f06fd5f8f2b6121ce72b46 -SHA1 (patch-an) = 528ee8254f988ade48ab2ec6bde01bfd4ca423ad -SHA1 (patch-ao) = 31724d3e4eb9d44b6a701f4317fc5ae35c4f2f66 -SHA1 (patch-ap) = 31e535a78dfb1fe38d7a1bb0e651b9189e88bdff -SHA1 (patch-aq) = 58ea5945277d08678988eb6598eb82c724376842 -SHA1 (patch-ar) = 6a22a31ff7a6d3e9ab73eac6ce228885f175de0c -SHA1 (patch-as) = 46aa8ddba11ada33f4f6b1227895a23d6cd85862 -SHA1 (patch-at) = 32fd8634ca40c9f2dc19c648404172c6e3a98be3 -SHA1 (patch-au) = 509f82d338a7d8322cf91b9dee957cd8ff21586c -SHA1 (patch-av) = 4210f8d36ebe09d92313a8fb48a643a4c24c6550 -SHA1 (patch-aw) = 21ff2eb27a91eecc5e51a2cfe3cdcb8f97b32522 -SHA1 (patch-ax) = 522cc70136f50b3c11119ff2d147b09ba3230b60 -SHA1 (patch-ay) = 85a73ff42df585630bcc26c55bf1b36675211c67 -SHA1 (patch-az) = 967481a79a35a7261ddfbb2f67e475122dde2e9d -SHA1 (patch-ba) = 163c39a44477dc28c63afc0c1578680d7b848663 diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa deleted file mode 100644 index ecd77adabf0..00000000000 --- a/x11/gnome-libs/patches/patch-aa +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-aa,v 1.17 2002/08/25 18:40:32 jlam Exp $ - ---- configure.orig Tue Jan 22 14:35:12 2002 -+++ configure -@@ -3271,12 +3271,9 @@ - - - --GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` --GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` --if test -z "$GLIB_LDFLAGS" ; then -- GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'` --fi --GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" -+GLIB_CFLAGS="`glib-config --cflags`" -+GLIB_LIBS="`glib-config --libs`" -+GLIB_LDFLAGS="$GLIB_LIBS" - - - -@@ -5127,6 +5124,11 @@ - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES -+ -+# NetBSD: set DATADIRNAME to "share" -+DATADIRNAME="${PKGLOCALEDIR}" -+INTLDEPS= -+INTLLIBS="-lintl" - - # AM_GNOME_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed -@@ -9942,7 +9944,7 @@ - GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS" - ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" - --GNOME_LIBDIR='-L${libdir}' -+GNOME_LIBDIR='-L${libdir} -Wl,-R${libdir}' - GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' - GNOME_IDLDIR='-I${datadir}/idl' - -@@ -10046,8 +10048,8 @@ - fi - if test x$gnome_cv_orbit_found = xyes; then - -- ORBIT_CFLAGS=`orbit-config --cflags client server` -- ORBIT_LIBS=`orbit-config --use-service=name --libs client server` -+ ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server` -+ ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server` - - - else diff --git a/x11/gnome-libs/patches/patch-ab b/x11/gnome-libs/patches/patch-ab deleted file mode 100644 index 585bb2bc438..00000000000 --- a/x11/gnome-libs/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2004/11/10 14:49:36 sketch Exp $ - ---- gnome-data/Makefile.in.orig Sun Mar 24 13:17:54 2002 -+++ gnome-data/Makefile.in -@@ -164,7 +164,7 @@ - gnome-make-postscript-mimes - - --scoredir = $(localstatedir)/games -+scoredir = @VARBASE@/games - sysconf_DATA = paper.config mime-magic - - soundlistdir = $(sysconfdir)/sound/events diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac deleted file mode 100644 index a4a70c0fb88..00000000000 --- a/x11/gnome-libs/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.13 2002/08/25 18:40:32 jlam Exp $ - ---- zvt/subshell-includes.h.orig Fri Jun 15 02:04:52 2001 -+++ zvt/subshell-includes.h Thu Aug 1 15:15:35 2002 -@@ -3,7 +3,7 @@ - - #include <stdio.h> - #include <fcntl.h> /* for close-on-exec stuff */ --#ifndef _XOPEN_SOURCE -+#if !defined(__NetBSD__) && !defined(_XOPEN_SOURCE) - #define _XOPEN_SOURCE 1 - #endif - #define __EXTENSIONS__ 1 /* needed for winsize struct diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad deleted file mode 100644 index c642c04d0eb..00000000000 --- a/x11/gnome-libs/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.10 2002/03/24 19:53:44 rh Exp $ - ---- libgnome/Makefile.in.orig Fri Jan 25 09:58:07 2002 -+++ libgnome/Makefile.in -@@ -156,7 +156,7 @@ - - INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -- -I$(includedir) $(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS) \ -+ $(GLIB_CFLAGS) $(GDK_IMLIB_CFLAGS) \ - $(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) \ - -DGNOMELIBDIR=\""$(libdir)"\" \ - -DGNOMEDATADIR=\""$(datadir)"\" \ -@@ -303,7 +303,7 @@ - gnome_gen_mimedb_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) ${LIBGNOME_LTCOMPILE_FLAGS} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - man1dir = $(mandir)/man1 - MANS = $(man_MANS) -@@ -396,7 +396,7 @@ - maintainer-clean-libtool: - - libgnome.la: $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgnome_la_LDFLAGS) $(libgnome_la_OBJECTS) $(libgnome_la_LIBADD) $(LIBS) -+ $(LINK) ${LIBGNOME_LTLINK_FLAGS} -rpath $(libdir) $(libgnome_la_LDFLAGS) $(libgnome_la_OBJECTS) $(libgnome_la_LIBADD) $(LIBS) - - mostlyclean-binPROGRAMS: - diff --git a/x11/gnome-libs/patches/patch-ae b/x11/gnome-libs/patches/patch-ae deleted file mode 100644 index 1b23b304c9d..00000000000 --- a/x11/gnome-libs/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2002/03/24 19:53:45 rh Exp $ - ---- devel-docs/Makefile.in.orig Fri Jan 25 09:58:24 2002 -+++ devel-docs/Makefile.in -@@ -169,7 +169,7 @@ - $(TEXT_FILES) - - --docdir = $(prefix)/doc -+docdir = $(datadir)/doc/gnome-libs - doc_DATA = $(TEXT_FILES) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/x11/gnome-libs/patches/patch-af b/x11/gnome-libs/patches/patch-af deleted file mode 100644 index d54a7bb060b..00000000000 --- a/x11/gnome-libs/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 2002/03/24 19:53:45 rh Exp $ - ---- tools/gnome-doc/Makefile.in.orig Fri Jan 25 09:58:04 2002 -+++ tools/gnome-doc/Makefile.in -@@ -148,7 +148,7 @@ - - EXTRA_DIST = gnome-doc.el gnome-doc mkstub $(man_MANS) - --docdir = $(datadir)/doc -+docdir = $(datadir)/doc/gnome-libs - - doc_DATA = $(EXTRA_DIST) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11/gnome-libs/patches/patch-ag b/x11/gnome-libs/patches/patch-ag deleted file mode 100644 index e86fd6c4845..00000000000 --- a/x11/gnome-libs/patches/patch-ag +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-ag,v 1.7 2004/02/18 11:56:02 jmmv Exp $ - ---- libgnomeui/gnome-messagebox.c.orig 2000-06-29 03:40:25.000000000 +0200 -+++ libgnomeui/gnome-messagebox.c -@@ -109,7 +109,7 @@ gnome_message_box_new (const gchar - if (strcmp(GNOME_MESSAGE_BOX_INFO, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Information")); -- s = gnome_unconditional_pixmap_file("gnome-info.png"); -+ s = gnome_unconditional_pixmap_file("gnome1-info.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -118,7 +118,7 @@ gnome_message_box_new (const gchar - else if (strcmp(GNOME_MESSAGE_BOX_WARNING, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Warning")); -- s = gnome_unconditional_pixmap_file("gnome-warning.png"); -+ s = gnome_unconditional_pixmap_file("gnome1-warning.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -127,7 +127,7 @@ gnome_message_box_new (const gchar - else if (strcmp(GNOME_MESSAGE_BOX_ERROR, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Error")); -- s = gnome_unconditional_pixmap_file("gnome-error.png"); -+ s = gnome_unconditional_pixmap_file("gnome1-error.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -136,7 +136,7 @@ gnome_message_box_new (const gchar - else if (strcmp(GNOME_MESSAGE_BOX_QUESTION, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Question")); -- s = gnome_unconditional_pixmap_file("gnome-question.png"); -+ s = gnome_unconditional_pixmap_file("gnome1-question.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -155,7 +155,7 @@ gnome_message_box_new (const gchar - if ( (pixmap == NULL) || - (GNOME_PIXMAP(pixmap)->pixmap == NULL) ) { - if (pixmap) gtk_widget_destroy(pixmap); -- s = gnome_unconditional_pixmap_file ("gnome-default-dlg.png"); -+ s = gnome_unconditional_pixmap_file ("gnome1-default-dlg.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -242,7 +242,7 @@ gnome_message_box_newv (const gchar - if (strcmp(GNOME_MESSAGE_BOX_INFO, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Information")); -- s = gnome_pixmap_file("gnome-info.png"); -+ s = gnome_pixmap_file("gnome1-info.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -251,7 +251,7 @@ gnome_message_box_newv (const gchar - else if (strcmp(GNOME_MESSAGE_BOX_WARNING, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Warning")); -- s = gnome_pixmap_file("gnome-warning.png"); -+ s = gnome_pixmap_file("gnome1-warning.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -260,7 +260,7 @@ gnome_message_box_newv (const gchar - else if (strcmp(GNOME_MESSAGE_BOX_ERROR, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Error")); -- s = gnome_pixmap_file("gnome-error"); -+ s = gnome_pixmap_file("gnome1-error"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -269,7 +269,7 @@ gnome_message_box_newv (const gchar - else if (strcmp(GNOME_MESSAGE_BOX_QUESTION, message_box_type) == 0) - { - gtk_window_set_title (GTK_WINDOW (message_box), _("Question")); -- s = gnome_pixmap_file("gnome-question.png"); -+ s = gnome_pixmap_file("gnome1-question.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); -@@ -288,7 +288,7 @@ gnome_message_box_newv (const gchar - if ( (pixmap == NULL) || - (GNOME_PIXMAP(pixmap)->pixmap == NULL) ) { - if (pixmap) gtk_widget_destroy(pixmap); -- s = gnome_pixmap_file("gnome-default.png"); -+ s = gnome_pixmap_file("gnome1-default.png"); - if (s) { - pixmap = gnome_pixmap_new_from_file(s); - g_free(s); diff --git a/x11/gnome-libs/patches/patch-ah b/x11/gnome-libs/patches/patch-ah deleted file mode 100644 index ada602e0142..00000000000 --- a/x11/gnome-libs/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ah,v 1.6 2004/02/18 11:56:02 jmmv Exp $ - ---- images/Makefile.in.orig 2002-08-16 00:25:24.000000000 +0200 -+++ images/Makefile.in -@@ -185,12 +185,13 @@ install-pixmapDATA: $(pixmap_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pixmapdir) - @list='$(pixmap_DATA)'; for p in $$list; do \ -+ d=`echo $$p | sed -e 's|^gnome-|gnome1-|'`; \ - if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$d"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$d; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$d"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$d; \ - fi; fi; \ - done - diff --git a/x11/gnome-libs/patches/patch-ai b/x11/gnome-libs/patches/patch-ai deleted file mode 100644 index 83aad394ef3..00000000000 --- a/x11/gnome-libs/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2005/04/27 09:11:36 wiz Exp $ - ---- libart_lgpl/libart.m4.orig 2000-04-05 10:14:15.000000000 +0200 -+++ libart_lgpl/libart.m4 -@@ -8,7 +8,7 @@ - dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS - dnl --AC_DEFUN(AM_PATH_LIBART, -+AC_DEFUN([AM_PATH_LIBART], - [dnl - dnl Get the cflags and libraries from the libart-config script - dnl diff --git a/x11/gnome-libs/patches/patch-aj b/x11/gnome-libs/patches/patch-aj deleted file mode 100644 index 38198b9de0a..00000000000 --- a/x11/gnome-libs/patches/patch-aj +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aj,v 1.4 2000/10/17 23:57:46 jlam Exp $ - ---- gnome-config.in.orig Wed Sep 27 19:59:01 2000 -+++ gnome-config.in -@@ -40,6 +40,8 @@ - module_dirs="$extra:$module_dirs" - done - -+module_dirs="@LOCALBASE@/lib:$module_dirs" -+ - usage() - { - exit_code=$1 -@@ -173,11 +175,11 @@ - the_flags="$the_flags `gtk-config --cflags`" - ;; - gnome) -- the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ @INTLLIBS@" - the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" - ;; - gnomeui) -- the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@" -+ the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@ @INTLLIBS@" - the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@" - ;; - gtkxmhtml) -@@ -253,7 +255,7 @@ - case "$i" in - # a library, save it for later, in reverse order - -l*) rev_libs="$i $rev_libs" ;; -- -L*|-R*) -+ -L*|-R*|-Wl,-R*) - if $libs_L; then - case " $lib_L_flags " in - *\ $i\ *) ;; # already there diff --git a/x11/gnome-libs/patches/patch-ak b/x11/gnome-libs/patches/patch-ak deleted file mode 100644 index 32dacd20393..00000000000 --- a/x11/gnome-libs/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2002/03/24 19:53:45 rh Exp $ - ---- libart_lgpl/configure.orig Tue Jan 22 14:35:13 2002 -+++ libart_lgpl/configure -@@ -1625,7 +1625,7 @@ - fi - fi - --LIBART_LIBDIR='-L${libdir}' -+LIBART_LIBDIR='-L${libdir} -Wl,-R${libdir}' - LIBART_INCLUDEDIR='-I${includedir}/gnome-1.0' - LIBART_LIBS='-lart_lgpl -lm' - diff --git a/x11/gnome-libs/patches/patch-al b/x11/gnome-libs/patches/patch-al deleted file mode 100644 index 74f86fb2a74..00000000000 --- a/x11/gnome-libs/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.4 2005/11/25 14:40:45 kristerw Exp $ - ---- gtk-xmhtml/colors.c.orig 2005-11-24 21:23:31.000000000 +0100 -+++ gtk-xmhtml/colors.c 2005-11-24 21:23:59.000000000 +0100 -@@ -295,7 +295,7 @@ - /* XXX: This function does an XQueryColors() the hard way, because there is - * no corresponding function in Gdk. - */ --#ifndef WITH_MOTIF -+#if 0 - static void - my_x_query_colors(GdkColormap *colormap, - GdkColor *colors, diff --git a/x11/gnome-libs/patches/patch-an b/x11/gnome-libs/patches/patch-an deleted file mode 100644 index 5d2d5d9332b..00000000000 --- a/x11/gnome-libs/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.4 2004/11/10 14:49:36 sketch Exp $ - ---- libgnome/gnome-score.c.orig Sat Jun 17 12:53:33 2000 -+++ libgnome/gnome-score.c -@@ -27,7 +27,7 @@ - #define NSCORES 10 - #endif - --#define SCORE_PATH GNOMELOCALSTATEDIR "/games" -+#define SCORE_PATH "@VARBASE@/games" - - struct command - { diff --git a/x11/gnome-libs/patches/patch-ao b/x11/gnome-libs/patches/patch-ao deleted file mode 100644 index 17d2d4201f7..00000000000 --- a/x11/gnome-libs/patches/patch-ao +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2000/10/17 23:57:46 jlam Exp $ - ---- zvt/vt.c.orig Sat Mar 18 02:57:13 2000 -+++ zvt/vt.c -@@ -1154,7 +1154,8 @@ - - for (j = 0; j < vt->argcnt; j++) { - i = vt->arg.num.intargs[j]; -- if (i==0 || i==27) { -+ if (i==0) { -+ /* \E[27m only clears reverse video, not all attributes - mycroft */ - vt->attr=VTATTR_CLEAR; - } else if (i<9) { - vt->attr |= mode_map[i]; /* add a mode */ diff --git a/x11/gnome-libs/patches/patch-ap b/x11/gnome-libs/patches/patch-ap deleted file mode 100644 index 58604dafdaa..00000000000 --- a/x11/gnome-libs/patches/patch-ap +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2000/11/11 02:07:57 mycroft Exp $ - ---- zvt/subshell.c.orig Sat Nov 11 01:59:48 2000 -+++ zvt/subshell.c Sat Nov 11 01:59:11 2000 -@@ -101,32 +101,43 @@ - #endif - #endif /* CMSG_DATA */ - --static struct cmsghdr *cmptr; --#define CONTROLLEN sizeof (struct cmsghdr) + sizeof (int) -+#define FD_LEN (sizeof(int) * 1) -+ -+static void *cmptr; - - static int - receive_fd (int helper_fd) - { - struct iovec iov [1]; - struct msghdr msg; -+ struct cmsghdr *cmp; - char buf [32]; - -+ if (cmptr == NULL && (cmptr = g_malloc (CMSG_SPACE(FD_LEN))) == NULL) -+ return -1; -+ - iov [0].iov_base = buf; - iov [0].iov_len = sizeof (buf); -+ -+ memset(&msg, 0, sizeof(msg)); - msg.msg_iov = iov; - msg.msg_iovlen = 1; - msg.msg_name = NULL; - msg.msg_namelen = 0; -- -- if (cmptr == NULL && (cmptr = g_malloc (CONTROLLEN)) == NULL) -- return -1; - msg.msg_control = (caddr_t) cmptr; -- msg.msg_controllen = CONTROLLEN; -+ msg.msg_controllen = CMSG_LEN(FD_LEN); - -+ memset(cmptr, 0, CMSG_SPACE(FD_LEN)); - if (recvmsg (helper_fd, &msg, 0) <= 0) - return -1; - -- return *(int *) CMSG_DATA (cmptr); -+ for (cmp = CMSG_FIRSTHDR(&msg); cmp != NULL; -+ cmp = CMSG_NXTHDR(&msg, cmp)) { -+ if (cmp->cmsg_type == SCM_RIGHTS) -+ return *(int *) CMSG_DATA (cmp); -+ } -+ -+ return -1; - } - - static int diff --git a/x11/gnome-libs/patches/patch-aq b/x11/gnome-libs/patches/patch-aq deleted file mode 100644 index 3354f21a145..00000000000 --- a/x11/gnome-libs/patches/patch-aq +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2000/11/27 10:59:20 rh Exp $ - ---- zvt/gnome-pty-helper.c.orig Sat Mar 18 08:57:13 2000 -+++ zvt/gnome-pty-helper.c -@@ -115,14 +115,20 @@ - #endif - #endif /* CMSG_DATA */ - --#define CONTROLLEN (sizeof (struct cmsghdr) + sizeof (int)) -+#ifndef CMSG_SPACE -+#include <machine/param.h> -+#define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l)) -+#define CMSG_LEN(l) (ALIGN(sizeof(struct cmsghdr)) + (l)) -+#endif - --static struct cmsghdr *cmptr; -+#define FD_LEN (sizeof(int) * 1) -+ -+static void *cmptr; - - static int - init_msg_pass () - { -- cmptr = malloc (CONTROLLEN); -+ cmptr = malloc (CMSG_SPACE(FD_LEN)); - - if (cmptr) - return 0; -@@ -135,22 +141,26 @@ - { - struct iovec iov[1]; - struct msghdr msg; -+ struct cmsghdr *cmp; - char buf [1]; - - iov [0].iov_base = buf; - iov [0].iov_len = 1; - -+ memset(&msg, 0, sizeof(msg)); - msg.msg_iov = iov; - msg.msg_iovlen = 1; - msg.msg_name = NULL; - msg.msg_namelen = 0; - msg.msg_control = (caddr_t) cmptr; -- msg.msg_controllen = CONTROLLEN; -+ msg.msg_controllen = CMSG_LEN(FD_LEN); - -- cmptr->cmsg_level = SOL_SOCKET; -- cmptr->cmsg_type = SCM_RIGHTS; -- cmptr->cmsg_len = CONTROLLEN; -- *(int *)CMSG_DATA (cmptr) = fd; -+ memset(cmptr, 0, CMSG_SPACE(FD_LEN)); -+ cmp = CMSG_FIRSTHDR(&msg); -+ cmp->cmsg_level = SOL_SOCKET; -+ cmp->cmsg_type = SCM_RIGHTS; -+ cmp->cmsg_len = CMSG_LEN(FD_LEN); -+ *(int *)CMSG_DATA (cmp) = fd; - - if (sendmsg (client_fd, &msg, 0) != 1) - return -1; diff --git a/x11/gnome-libs/patches/patch-ar b/x11/gnome-libs/patches/patch-ar deleted file mode 100644 index 9850130fc93..00000000000 --- a/x11/gnome-libs/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.5 2002/03/24 19:53:46 rh Exp $ - ---- gtk-xmhtml/Makefile.in.orig Fri Jan 25 09:58:13 2002 -+++ gtk-xmhtml/Makefile.in -@@ -146,7 +146,7 @@ - - libgtkxmhtmlincludedir = $(includedir)/gnome-1.0/gtk-xmhtml - --INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \ -+INCLUDES = -I.. -I$(srcdir)/.. @GTK_CFLAGS@ \ - -DWITH_GTK -DDEBUG -DGNOME_LIB - - diff --git a/x11/gnome-libs/patches/patch-as b/x11/gnome-libs/patches/patch-as deleted file mode 100644 index 011890fe247..00000000000 --- a/x11/gnome-libs/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.2 2002/03/24 19:53:46 rh Exp $ - ---- libgnomeui/Makefile.in.orig Fri Jan 25 09:58:10 2002 -+++ libgnomeui/Makefile.in -@@ -160,7 +160,7 @@ - - INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -- -I$(includedir) $(GDK_IMLIB_CFLAGS) \ -+ $(GDK_IMLIB_CFLAGS) \ - $(AUDIOFILE_CFLAGS) $(ESD_CFLAGS) \ - -DGNOMELIBDIR=\""$(libdir)"\" \ - -DGNOMEDATADIR=\""$(datadir)"\" \ diff --git a/x11/gnome-libs/patches/patch-at b/x11/gnome-libs/patches/patch-at deleted file mode 100644 index 6848cfd2bb3..00000000000 --- a/x11/gnome-libs/patches/patch-at +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-at,v 1.2 2002/03/24 19:53:47 rh Exp $ - ---- libgnorba/Makefile.in.orig Fri Jan 25 09:58:19 2002 -+++ libgnorba/Makefile.in -@@ -163,7 +163,6 @@ - -I.. \ - -I$(srcdir)/.. \ - $(SUPPORTINCS) \ -- -I$(includedir) \ - $(GNOME_INCLUDES) \ - $(ORBIT_CFLAGS) \ - $(GLIB_INCLUDES) \ diff --git a/x11/gnome-libs/patches/patch-au b/x11/gnome-libs/patches/patch-au deleted file mode 100644 index 8e99b729245..00000000000 --- a/x11/gnome-libs/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.2 2002/03/24 19:53:47 rh Exp $ - ---- test-gnome/Makefile.in.orig Fri Jan 25 09:58:22 2002 -+++ test-gnome/Makefile.in -@@ -146,7 +146,7 @@ - - INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -- -I$(includedir) $(GDK_IMLIB_CFLAGS) \ -+ $(GDK_IMLIB_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \ - -DLOCALEDIR=\""$(gnomelocaledir)"\" - diff --git a/x11/gnome-libs/patches/patch-av b/x11/gnome-libs/patches/patch-av deleted file mode 100644 index 45263f3ca08..00000000000 --- a/x11/gnome-libs/patches/patch-av +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-av,v 1.2 2002/03/24 19:53:48 rh Exp $ - ---- test-suite/tests/Makefile.in.orig Fri Jan 25 09:58:24 2002 -+++ test-suite/tests/Makefile.in -@@ -150,7 +150,6 @@ - -I$(top_builddir) -I$(top_srcdir) \ - $(SUPPORTINCS) \ - $(GDK_IMLIB_CFLAGS) \ -- -I$(includedir) \ - @GTK_CFLAGS@ - - diff --git a/x11/gnome-libs/patches/patch-aw b/x11/gnome-libs/patches/patch-aw deleted file mode 100644 index 68f4943c046..00000000000 --- a/x11/gnome-libs/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2002/03/24 19:53:48 rh Exp $ - ---- tools/convertrgb/Makefile.in.orig Fri Jan 25 09:58:03 2002 -+++ tools/convertrgb/Makefile.in -@@ -145,7 +145,7 @@ - need_gnome_support = @need_gnome_support@ - - INCLUDES = \ -- -I$(includedir) @GLIB_CFLAGS@ -+ @GLIB_CFLAGS@ - - - noinst_PROGRAMS = convertrgb diff --git a/x11/gnome-libs/patches/patch-ax b/x11/gnome-libs/patches/patch-ax deleted file mode 100644 index 8be46b3d209..00000000000 --- a/x11/gnome-libs/patches/patch-ax +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ax,v 1.3 2002/03/24 19:53:48 rh Exp $ - ---- zvt/Makefile.in.orig Fri Jan 25 09:58:16 2002 -+++ zvt/Makefile.in -@@ -152,7 +152,7 @@ - - INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -- -I$(includedir) $(GTK_CFLAGS) \ -+ $(GTK_CFLAGS) \ - $(GDK_IMLIB_CFLAGS) \ - -DGNOMESBINDIR=\""$(sbindir)"\" - -@@ -595,7 +595,7 @@ - - install-exec-local: - -file=$(DESTDIR)$(sbindir)/gnome-pty-helper; \ -- chown root $$file && chgrp root $$file && chmod u+s $$file -+ chown 0 $$file && chgrp 0 $$file && chmod u+s $$file - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/x11/gnome-libs/patches/patch-ay b/x11/gnome-libs/patches/patch-ay deleted file mode 100644 index 683e039c520..00000000000 --- a/x11/gnome-libs/patches/patch-ay +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-ay,v 1.3 2002/05/05 22:52:12 martin Exp $ - ---- libgnome/gnome-url.c.orig Thu Jan 10 23:03:17 2002 -+++ libgnome/gnome-url.c Mon May 6 00:06:38 2002 -@@ -80,6 +80,8 @@ - return default_handler; - } - -+static int gnome_url_show_with_handler (const gchar *url, const gchar *template); -+ - /** - * gnome_url_show - * @url: URL to show -@@ -105,11 +107,9 @@ - void - gnome_url_show(const gchar *url) - { -- gint i; - gchar *pos, *template; - gboolean free_template = FALSE; -- int argc; -- char **argv; -+ int status; - - g_return_if_fail (url != NULL); - pos = strchr (url, ':'); -@@ -135,12 +135,26 @@ - } else /* no : ? -- this shouldn't happen. Use default handler */ - template = gnome_url_default_handler (NULL); - -+ status = gnome_url_show_with_handler (url, template); -+ if (status == -1 && free_template) -+ gnome_url_show_with_handler (url, gnome_url_default_handler (NULL)); -+ -+ if (free_template) -+ g_free (template); -+} -+ -+static int -+gnome_url_show_with_handler (const gchar *url, const gchar *template) -+{ -+ int argc, i, status; -+ char **argv; -+ - /* we use a popt function as it does exactly what we want to do and - gnome already uses popt */ - if(poptParseArgvString(template, &argc, &argv) != 0) { - /* can't parse */ - g_warning("Parse error of '%s'", template); -- return; -+ return -1; - } - - /* we can just replace the entry in the array since the -@@ -154,13 +168,12 @@ - - /* use execute async, and not the shell, shell is evil and a - * security hole */ -- gnome_execute_async (NULL, argc, argv); -- -- if (free_template) -- g_free (template); -+ status = gnome_execute_async (NULL, argc, argv); - - /* the way the poptParseArgvString works is that the entire thing - * is allocated as one buffer, so just free will suffice, also - * it must be free and not g_free */ - free(argv); -+ -+ return status; - } diff --git a/x11/gnome-libs/patches/patch-az b/x11/gnome-libs/patches/patch-az deleted file mode 100644 index f57724934cc..00000000000 --- a/x11/gnome-libs/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.2 2002/08/25 18:40:32 jlam Exp $ - ---- libart_lgpl/doc/Makefile.in 2002/06/28 10:35:09 1.1 -+++ libart_lgpl/doc/Makefile.in 2002/06/28 10:35:23 -@@ -371,8 +371,6 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ - fi) - - # diff --git a/x11/gnome-libs/patches/patch-ba b/x11/gnome-libs/patches/patch-ba deleted file mode 100644 index 461ddd402b0..00000000000 --- a/x11/gnome-libs/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2004/05/04 03:54:51 danw Exp $ - ---- gtk-xmhtml/XmHTMLP.h.orig Mon May 3 23:26:18 2004 -+++ gtk-xmhtml/XmHTMLP.h -@@ -264,7 +264,7 @@ - # else - typedef GdkColorContext *XCC; - # endif --# ifdef _ZCONF_H -+# if defined(_ZCONF_H) || defined(ZCONF_H) - # ifndef BYTE_ALREADY_TYPEDEFED - # define BYTE_ALREADY_TYPEDEFED - # endif /* BYTE_ALREADY_TYPEDEFED */ |