diff options
author | wiz <wiz@pkgsrc.org> | 2007-09-19 23:34:57 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2007-09-19 23:34:57 +0000 |
commit | d03ca16489362d355555c45f212f1de3a7bf4650 (patch) | |
tree | e58a9d414234cdb7afc807c0a3bc170cba96d32d | |
parent | ff42e965eadebd3995fd822e21a6b7642e8c8874 (diff) | |
download | pkgsrc-d03ca16489362d355555c45f212f1de3a7bf4650.tar.gz |
Finish rename of gnome-vfs2 to gnome-vfs.
27 files changed, 2 insertions, 906 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 3d4642f8dd6..afac3c1d7fd 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.408 2007/08/13 08:12:49 rillig Exp $ +# $NetBSD: Makefile,v 1.409 2007/09/19 23:34:57 wiz Exp $ # COMMENT= System utilities @@ -107,8 +107,8 @@ SUBDIR+= gkrellm-server SUBDIR+= gkrellm-share SUBDIR+= gnome-menus SUBDIR+= gnome-pkgview +SUBDIR+= gnome-vfs SUBDIR+= gnome-vfs-monikers -SUBDIR+= gnome-vfs2 SUBDIR+= gnome-vfsmm SUBDIR+= gnome2-system-monitor SUBDIR+= gnometoaster diff --git a/sysutils/gnome-vfs2/DESCR b/sysutils/gnome-vfs2/DESCR deleted file mode 100644 index f76a7c7b3f5..00000000000 --- a/sysutils/gnome-vfs2/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -This is the GNOME Virtual File System, version 2. - -GNOME VFS provides an abstraction layer of the file system; applications -use this layer to access many different protocols and simulate that they -are part of the local file system. diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile deleted file mode 100644 index 12b0b294757..00000000000 --- a/sysutils/gnome-vfs2/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# $NetBSD: Makefile,v 1.73 2007/06/05 08:11:44 wiz Exp $ - -PKGREVISION= 2 -PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in -PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in - -OWN_DIRS= ${PKG_SYSCONFDIR}/modules - -EGFILES+= modules/default-modules.conf -EGFILES+= modules/ssl-modules.conf - -GCONF2_SCHEMAS= desktop_default_applications.schemas -GCONF2_SCHEMAS+= desktop_gnome_url_handlers.schemas -GCONF2_SCHEMAS+= system_dns_sd.schemas -GCONF2_SCHEMAS+= system_http_proxy.schemas -GCONF2_SCHEMAS+= system_smb.schemas - -LDFLAGS.Darwin+= -lresolv - -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.3 - -PKG_DESTDIR_SUPPORT= user-destdir - -.include "Makefile.common" - -CONFIGURE_ARGS+= --enable-fam - -.include "../../devel/GConf2/schemas.mk" - -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" - -.include "../../mk/fam.buildlink3.mk" -.include "../../mk/krb5.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common deleted file mode 100644 index 49c621c4b2d..00000000000 --- a/sysutils/gnome-vfs2/Makefile.common +++ /dev/null @@ -1,109 +0,0 @@ -# $NetBSD: Makefile.common,v 1.45 2007/09/19 23:13:28 wiz Exp $ -# - -GNOME_VFS_VERSION= 2.18.1 - -DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} -CATEGORIES?= sysutils -CATEGORIES+= gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.18/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= jmmv@NetBSD.org -HOMEPAGE= http://www.gnome.org/ -COMMENT= GNOME Virtual File System (v2) - -DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs/distinfo -PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs/patches - -GNU_CONFIGURE= YES -USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake intltool msgfmt pkg-config -USE_LIBTOOL= YES - -CONFIGURE_ARGS+= --disable-cdda -CONFIGURE_ARGS+= --disable-gtk -CONFIGURE_ARGS+= --disable-howl -CONFIGURE_ARGS+= --disable-openssl -CONFIGURE_ARGS+= --disable-samba -CONFIGURE_ARGS+= --enable-gnutls -CONFIGURE_ARGS+= --enable-platform-gnome-2 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} - -CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" -CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" -MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale - -INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} -INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules - -PKG_SYSCONFSUBDIR= gnome-vfs-2.0 - -EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 -.for f in ${EGFILES} -CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} -.endfor - -.include "../../mk/bsd.prefs.mk" - -# XXX Work-around for a problem in the configure script which checks for -# statvfs(2) having SVR4 in mind. Solving this in the script itself could -# be the right way to go, but it is out of the scope of a local patch; it -# could require changing the code a lot, which is already very... complex. -.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h) -post-wrapper: - ${MKDIR} -p ${BUILDLINK_DIR}/include/sys - ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h -.endif - -# -# The following stuff is to allow easy building of modules distributed within -# gnome-vfs as independent packages. -# -# GNOME_VFS_NAME - Name of the module beeing built. Will be added to the -# package name, and also used as the library name. -# GNOME_VFS_FLAG - Base name of the flag passed to configure to enable the -# module. -# -.if defined(GNOME_VFS_NAME) && !empty(GNOME_VFS_NAME) -GNOME_VFS_FLAG?= ${GNOME_VFS_NAME} - -PKGNAME:= ${PKGNAME:S/gnome-vfs/gnome-vfs-${GNOME_VFS_NAME}/} -CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/} -COMMENT+= - ${GNOME_VFS_NAME} plugin - -CONFLICTS+= gnome-vfs2-[0-9]* - -BUILD_TARGET= lib${GNOME_VFS_NAME}.la -BUILD_DIRS= ${WRKSRC}/modules - -# Fix paths to already installed libraries (by the gnome-vfs package). -SUBST_CLASSES+= libs -SUBST_MESSAGE.libs= Fixing path to dependent libraries. -SUBST_STAGE.libs= pre-configure -SUBST_FILES.libs= modules/Makefile.in -SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs}/lib/libgnomevfs-2.la|g' - -BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=${GNOME_VFS_VERSION} -.include "../../sysutils/gnome-vfs/buildlink3.mk" - -PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ - { print "@comment in gnome-vfs: " $$0; next; } -PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; } -PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \ - { print "@comment in gnome-vfs: " $$0; next; } - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gnome-vfs-2.0/modules - cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \ - ${INSTALL_DATA} lib${GNOME_VFS_NAME}.la \ - ${PREFIX}/lib/gnome-vfs-2.0/modules - cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \ - ${PREFIX}/lib/gnome-vfs-2.0/modules -.endif - -.include "../../devel/GConf2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../security/gnutls/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST deleted file mode 100644 index d4e4a4d74d0..00000000000 --- a/sysutils/gnome-vfs2/PLIST +++ /dev/null @@ -1,239 +0,0 @@ -@comment $NetBSD: PLIST,v 1.25 2007/04/10 17:58:22 drochner Exp $ -bin/gnomevfs-cat -bin/gnomevfs-copy -bin/gnomevfs-df -bin/gnomevfs-info -bin/gnomevfs-ls -bin/gnomevfs-mkdir -bin/gnomevfs-monitor -bin/gnomevfs-mv -bin/gnomevfs-rm -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.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 -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-dns-sd.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-version.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h -include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h -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-method.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.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 -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h -lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h -lib/gnome-vfs-2.0/modules/libbzip2.la -lib/gnome-vfs-2.0/modules/libcomputer.la -lib/gnome-vfs-2.0/modules/libdns-sd.la -lib/gnome-vfs-2.0/modules/libfile.la -lib/gnome-vfs-2.0/modules/libftp.la -lib/gnome-vfs-2.0/modules/libgzip.la -lib/gnome-vfs-2.0/modules/libhttp.la -lib/gnome-vfs-2.0/modules/libnetwork.la -lib/gnome-vfs-2.0/modules/libnntp.la -lib/gnome-vfs-2.0/modules/libsftp.la -lib/gnome-vfs-2.0/modules/libtar.la -lib/gnome-vfs-2.0/modules/libvfs-test.la -lib/libgnomevfs-2.la -lib/pkgconfig/gnome-vfs-2.0.pc -lib/pkgconfig/gnome-vfs-module-2.0.pc -libexec/gnome-vfs-daemon -share/dbus-1/services/gnome-vfs-daemon.service -share/examples/gnome-vfs-2.0/modules/default-modules.conf -share/examples/gnome-vfs-2.0/modules/ssl-modules.conf -share/gconf/schemas/desktop_default_applications.schemas -share/gconf/schemas/desktop_gnome_url_handlers.schemas -share/gconf/schemas/system_dns_sd.schemas -share/gconf/schemas/system_http_proxy.schemas -share/gconf/schemas/system_smb.schemas -share/gtk-doc/html/gnome-vfs-2.0/about.html -share/gtk-doc/html/gnome-vfs-2.0/data-types.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-2.0.devhelp -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-2.0.devhelp2 -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-utils.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-basic-file-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-directory-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-file-async-ops.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-first-steps.html -share/gtk-doc/html/gnome-vfs-2.0/gnome-vfs-writing-modules.html -share/gtk-doc/html/gnome-vfs-2.0/home.png -share/gtk-doc/html/gnome-vfs-2.0/index.html -share/gtk-doc/html/gnome-vfs-2.0/index.sgml -share/gtk-doc/html/gnome-vfs-2.0/left.png -share/gtk-doc/html/gnome-vfs-2.0/mime-registry.html -share/gtk-doc/html/gnome-vfs-2.0/modules.html -share/gtk-doc/html/gnome-vfs-2.0/networking.html -share/gtk-doc/html/gnome-vfs-2.0/right.png -share/gtk-doc/html/gnome-vfs-2.0/style.css -share/gtk-doc/html/gnome-vfs-2.0/up.png -share/gtk-doc/html/gnome-vfs-2.0/volumes.html -share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo -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 -share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo -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/gu/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/hr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/rw/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zh_HK/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo -@dirrm share/gtk-doc/html/gnome-vfs-2.0 -@comment in GConf2: @dirrm share/gconf/schemas -@dirrm share/examples/gnome-vfs-2.0/modules -@dirrm share/examples/gnome-vfs-2.0 -@comment in dbus: @dirrm share/dbus-1/services -@dirrm lib/gnome-vfs-2.0/modules -@dirrm lib/gnome-vfs-2.0/include -@dirrm lib/gnome-vfs-2.0 -@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 diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk deleted file mode 100644 index af7ad5481f2..00000000000 --- a/sysutils/gnome-vfs2/buildlink3.mk +++ /dev/null @@ -1,30 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.29 2007/09/19 23:13:29 wiz Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-vfs -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs} -BUILDLINK_PACKAGES+= gnome-vfs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs - -.if !empty(GNOME_VFS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.0 -BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=2.18.1nb2 -BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs - -PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ - { print "@comment in gnome-vfs: " $$0; next; } -.endif # GNOME_VFS_BUILDLINK3_MK - -.include "../../devel/GConf2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../security/gnutls/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo deleted file mode 100644 index 42fe1ba9ed6..00000000000 --- a/sysutils/gnome-vfs2/distinfo +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: distinfo,v 1.63 2007/04/10 17:58:22 drochner Exp $ - -SHA1 (gnome-vfs-2.18.1.tar.bz2) = e939fe4fe2e75516ae6c4d476f8fb44f59ec8bdc -RMD160 (gnome-vfs-2.18.1.tar.bz2) = ff2fc7a7c47b85a03d65964a8ad1d7d585698f3d -Size (gnome-vfs-2.18.1.tar.bz2) = 1916897 bytes -SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db -SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 -SHA1 (patch-ae) = 05b28610539d22491b8694ef3850b77be47c7c6c -SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 -SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 -SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 -SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 -SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370 -SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b -SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4 -SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c -SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db -SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51 -SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3 -SHA1 (patch-bc) = d71be2e22ae3bb87c163a43ae457362a0e77cfe1 -SHA1 (patch-ca) = c8d73a528d4a7260e4d976ba6c426ca92e7593e8 -SHA1 (patch-cb) = 370c75a72d8575051bb5f02d54fdd4a191ac00eb -SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29 -SHA1 (patch-cd) = e32c32e4a9834cc3335d5192a1110bfed9c4fd4c -SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73 diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa deleted file mode 100644 index 669a423a05a..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2005/01/11 12:32:53 jmmv Exp $ - ---- libgnomevfs/xdgmime.c.orig 2004-07-24 16:39:43.000000000 +0200 -+++ libgnomevfs/xdgmime.c -@@ -189,7 +189,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = PREFIX "/share/"; - - ptr = xdg_data_dirs; - diff --git a/sysutils/gnome-vfs2/patches/patch-ab b/sysutils/gnome-vfs2/patches/patch-ab deleted file mode 100644 index c4560c90a9f..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2004/11/28 13:00:17 recht Exp $ - ---- Makefile.in.orig Thu Oct 28 16:16:56 2004 -+++ Makefile.in Sat Nov 27 20:51:12 2004 -@@ -221,7 +221,6 @@ - modules \ - daemon \ - schemas \ -- devel-docs \ - doc \ - programs \ - test \ diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae deleted file mode 100644 index 2a1baf5daad..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ae +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-ae,v 1.14 2007/04/10 17:58:23 drochner Exp $ - ---- configure.orig 2007-04-10 14:08:42.000000000 +0200 -+++ configure -@@ -24490,7 +24490,7 @@ fi - - - --for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll -+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -25772,9 +25772,11 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { -+#ifndef HAVE_STATVFS - struct statfs st; - statfs(NULL, &st); - ; -+#endif - return 0; - } - _ACEOF -@@ -33097,7 +33099,7 @@ _ACEOF - - msg_samba="yes" - if test x$with_samba_libs != x/usr/lib; then -- SAMBA_LIBS="-L$with_samba_libs -lsmbclient" -+ SAMBA_LIBS="-L$with_samba_libs -Wl,-R$with_samba_libs -lsmbclient" - else - SAMBA_LIBS="-lsmbclient" - fi -@@ -36182,12 +36184,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` -+ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -36200,12 +36202,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` -+ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -36224,14 +36226,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"` -+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"` - else -- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"` -+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGNOMEVFS_PKG_ERRORS" >&5 - -- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: - - $LIBGNOMEVFS_PKG_ERRORS - -@@ -36242,7 +36244,7 @@ Alternatively, you may set the environme - and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: -+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: - - $LIBGNOMEVFS_PKG_ERRORS - diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af deleted file mode 100644 index 2a0cdb3116f..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.8 2005/10/07 16:10:44 drochner Exp $ - ---- libgnomevfs/gnome-vfs-cdrom.c.orig 2005-05-08 19:49:56.000000000 +0200 -+++ libgnomevfs/gnome-vfs-cdrom.c -@@ -37,6 +37,8 @@ - - #ifdef __linux__ - #include <linux/cdrom.h> -+#elif defined(__APPLE__) -+#include <modules/cdda-cdrom-extensions.h> - #endif - - #ifdef HAVE_SYS_CDIO_H diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai deleted file mode 100644 index e11d255a623..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.11 2006/01/01 17:31:53 jmmv Exp $ - ---- modules/fstype.c.orig 2004-08-12 11:08:56.000000000 +0200 -+++ modules/fstype.c -@@ -349,8 +349,12 @@ filesystem_type_uncached (char *path, ch - fstype_internal_error (1, errno, "%s", path); - } - else -+#if defined(__NetBSD__) -+ type = fss.f_fstypename; -+#else - type = fss.f_basetype; - #endif -+#endif - - #ifdef FSTYPE_STATFS /* 4.4BSD. */ - struct statfs fss; diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am deleted file mode 100644 index 379472a7fed..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-am +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-am,v 1.12 2005/08/25 16:23:42 reed Exp $ - ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Fri Dec 10 13:33:53 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Fri May 6 18:32:49 2005 -@@ -475,7 +475,11 @@ - gboolean - _gnome_vfs_get_current_unix_mounts (GList **return_list) - { -+#if defined(HAVE_STATVFS) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) -+ struct statvfs *mntent = NULL; -+#else - struct statfs *mntent = NULL; -+#endif - int num_mounts, i; - GnomeVFSUnixMount *mount_entry; - -@@ -492,7 +496,11 @@ - mount_entry->mount_path = g_strdup (mntent[i].f_mntonname); - mount_entry->device_path = g_strdup (mntent[i].f_mntfromname); - mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename); -+#if defined(HAVE_STATVFS) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) -+ if (mntent[i].f_flag & MNT_RDONLY) { -+#else - if (mntent[i].f_flags & MNT_RDONLY) { -+#endif - mount_entry->is_read_only = TRUE; - } - diff --git a/sysutils/gnome-vfs2/patches/patch-ao b/sysutils/gnome-vfs2/patches/patch-ao deleted file mode 100644 index 98b03c93d30..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2005/10/07 16:10:44 drochner Exp $ - ---- libgnomevfs/gnome-vfs-utils.c.orig 2005-09-15 13:02:53.000000000 +0200 -+++ libgnomevfs/gnome-vfs-utils.c -@@ -49,6 +49,12 @@ - #include <sys/param.h> - #include <sys/stat.h> - #include <sys/types.h> -+ -+#ifdef __APPLE__ -+#include <sys/mount.h> -+#define HAVE_STATVFS 0 -+#endif -+ - #include <unistd.h> - - #define KILOBYTE_FACTOR 1024.0 diff --git a/sysutils/gnome-vfs2/patches/patch-ap b/sysutils/gnome-vfs2/patches/patch-ap deleted file mode 100644 index 081521dde4c..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ap +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2007/04/10 17:58:23 drochner Exp $ - ---- modules/file-method.c.orig 2007-03-13 11:50:03.000000000 +0100 -+++ modules/file-method.c -@@ -134,13 +134,13 @@ GET_PATH_MAX (void) - } - #endif - --#ifdef HAVE_OPEN64 -+#if defined(HAVE_OPEN64) && !defined(__APPLE__) - #define OPEN open64 - #else - #define OPEN g_open - #endif - --#if defined(HAVE_LSEEK64) && defined(HAVE_OFF64_T) -+#if (defined(HAVE_LSEEK64) && defined(HAVE_OFF64_T)) && !defined(__APPLE__) - #define LSEEK lseek64 - #define OFF_T off64_t - #else diff --git a/sysutils/gnome-vfs2/patches/patch-aq b/sysutils/gnome-vfs2/patches/patch-aq deleted file mode 100644 index 164c352de14..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2004/10/24 18:03:24 recht Exp $ - ---- modules/bzip2-method.c.orig Sun Oct 24 19:01:44 2004 -+++ modules/bzip2-method.c Sun Oct 24 19:02:28 2004 -@@ -37,7 +37,7 @@ - - #include <bzlib.h> - --#ifdef HAVE_OLDER_BZIP2 -+#if defined(HAVE_OLDER_BZIP2) && !defined(__APPLE__) - #define BZ2_bzDecompressInit bzDecompressInit - #define BZ2_bzCompressInit bzCompressInit - #define BZ2_bzDecompress bzDecompress diff --git a/sysutils/gnome-vfs2/patches/patch-ar b/sysutils/gnome-vfs2/patches/patch-ar deleted file mode 100644 index a81054f2ac2..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ar +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ar,v 1.3 2006/04/27 18:37:24 rillig Exp $ - ---- libgnomevfs/gnome-vfs-pty.c.orig Tue Nov 22 15:10:17 2005 -+++ libgnomevfs/gnome-vfs-pty.c Wed Apr 26 23:15:08 2006 -@@ -306,7 +306,7 @@ _gnome_vfs_pty_run_on_pty(int fd, gboole - chdir(directory); - } - --#ifdef HAVE_UTMP_H -+#ifdef HAVE_LOGIN_TTY - /* This sets stdin, stdout, stderr to the socket */ - if (login && login_tty (fd) == -1) { - g_printerr ("mount child process login_tty failed: %s\n", strerror (errno)); -@@ -629,6 +629,7 @@ _gnome_vfs_pty_set_size(int master, int - static char * - _gnome_vfs_pty_ptsname(int master) - { -+#ifndef __APPLE__ - #if defined(HAVE_PTSNAME_R) - gsize len = 1024; - char *buf = NULL; -@@ -674,6 +675,7 @@ _gnome_vfs_pty_ptsname(int master) - return g_strdup_printf("/dev/pts/%d", pty); - } - #endif -+#endif /* __APPLE__ */ - return NULL; - } - -@@ -681,10 +683,10 @@ static int - _gnome_vfs_pty_getpt(void) - { - int fd, flags; --#ifdef HAVE_GETPT -+#if defined(HAVE_GETPT) && !defined(__APPLE__) - /* Call the system's function for allocating a pty. */ - fd = getpt(); --#elif defined(HAVE_POSIX_OPENPT) -+#elif defined(HAVE_POSIX_OPENPT) && !defined(__APPLE__) - fd = posix_openpt(O_RDWR | O_NOCTTY); - #else - /* Try to allocate a pty by accessing the pty master multiplex. */ -@@ -703,7 +705,7 @@ _gnome_vfs_pty_getpt(void) - static int - _gnome_vfs_pty_grantpt(int master) - { --#ifdef HAVE_GRANTPT -+#if defined(HAVE_GRANTPT) && !defined(__APPLE__) - return grantpt(master); - #else - return 0; -@@ -713,6 +715,9 @@ _gnome_vfs_pty_grantpt(int master) - static int - _gnome_vfs_pty_unlockpt(int fd) - { -+#ifdef __APPLE__ -+ return -1; -+#else - #ifdef HAVE_UNLOCKPT - return unlockpt(fd); - #elif defined(TIOCSPTLCK) -@@ -720,6 +725,7 @@ _gnome_vfs_pty_unlockpt(int fd) - return ioctl(fd, TIOCSPTLCK, &zero); - #else - return -1; -+#endif - #endif - } - diff --git a/sysutils/gnome-vfs2/patches/patch-au b/sysutils/gnome-vfs2/patches/patch-au deleted file mode 100644 index cae8b6e7b1a..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-au +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-au,v 1.2 2005/02/26 17:23:01 jmmv Exp $ - ---- modules/sftp-method.c.orig 2005-01-16 15:50:32.000000000 +0100 -+++ modules/sftp-method.c -@@ -2820,11 +2820,12 @@ do_rename (GnomeVFSMethod *method, - buffer_send (&msg, conn->out_fd); - buffer_free (&msg); - -+ res = iobuf_read_result (conn->in_fd, id); -+ -+ bail: - g_free (old_path); - g_free (new_path); - -- res = iobuf_read_result (conn->in_fd, id); -- - sftp_connection_unref (conn); - sftp_connection_unlock (conn); - diff --git a/sysutils/gnome-vfs2/patches/patch-ax b/sysutils/gnome-vfs2/patches/patch-ax deleted file mode 100644 index 57c2cb63924..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.3 2006/09/15 15:07:40 jmmv Exp $ - ---- libgnomevfs/gnome-vfs-job.h.orig 2006-08-21 14:58:06.000000000 +0200 -+++ libgnomevfs/gnome-vfs-job.h -@@ -56,7 +56,7 @@ G_STMT_START{ \ - gettimeofday(&_tt, NULL); \ - printf ("%ld:%6.ld ", _tt.tv_sec, _tt.tv_usec); \ - g_static_mutex_lock (&debug_mutex); \ -- fputs (__FUNCTION__, stdout); \ -+ fputs (G_GNUC_FUNCTION, stdout); \ - printf (": %d ", __LINE__); \ - printf x; \ - fputc ('\n', stdout); \ diff --git a/sysutils/gnome-vfs2/patches/patch-ba b/sysutils/gnome-vfs2/patches/patch-ba deleted file mode 100644 index 86131524fad..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2006/04/27 18:37:24 rillig Exp $ - ---- config.h.in.orig 2006-03-13 10:48:56.000000000 +0100 -+++ config.h.in 2006-04-27 20:33:25.416810500 +0200 -@@ -208,6 +208,8 @@ - /* Define to 1 if you have the `lseek64' function. */ - #undef HAVE_LSEEK64 - -+#undef HAVE_LOGIN_TTY -+ - /* Define to 1 if you have the `mbrtowc' function. */ - #undef HAVE_MBRTOWC - diff --git a/sysutils/gnome-vfs2/patches/patch-bb b/sysutils/gnome-vfs2/patches/patch-bb deleted file mode 100644 index 9711c70975d..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-bb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2006/12/01 21:16:02 rillig Exp $ - -Stick to the pkgsrc conventions for the locale directory. - ---- daemon/Makefile.in.orig 2006-05-30 12:21:17.000000000 +0200 -+++ daemon/Makefile.in 2006-06-25 23:35:21.000000000 +0200 -@@ -359,7 +359,7 @@ INCLUDES = \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ - -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ -- -DGNOMEVFS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" \ -+ -DGNOMEVFS_LOCALEDIR="\"$(localedir)\"" \ - -DGNOME_VFS_SYSCONFDIR=\"$(sysconfdir)\"\ - -DG_LOG_DOMAIN=\"libgnomevfs\" \ - -I$(top_srcdir) \ diff --git a/sysutils/gnome-vfs2/patches/patch-bc b/sysutils/gnome-vfs2/patches/patch-bc deleted file mode 100644 index 46408fbaa47..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-bc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2006/12/01 21:16:02 rillig Exp $ - -Stick to the pkgsrc conventions of the locale directory. - ---- libgnomevfs/Makefile.in.orig 2006-05-30 12:21:20.000000000 +0200 -+++ libgnomevfs/Makefile.in 2006-06-25 23:34:58.000000000 +0200 -@@ -459,7 +459,7 @@ INCLUDES = \ - -DGNOME_VFS_BINDIR=\"$(bindir)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ - -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ -- -DGNOME_VFS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" \ -+ -DGNOME_VFS_LOCALEDIR="\"$(localedir)\"" \ - -DGNOME_VFS_SYSCONFDIR=\"$(sysconfdir)\"\ - -DG_LOG_DOMAIN=\"libgnomevfs\" \ - $(NULL) diff --git a/sysutils/gnome-vfs2/patches/patch-ca b/sysutils/gnome-vfs2/patches/patch-ca deleted file mode 100644 index 6d37fd0ab44..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ca +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2006/11/24 17:30:23 drochner Exp $ - ---- libgnomevfs/xdgmime.h.orig 2006-10-13 15:38:37.000000000 +0200 -+++ libgnomevfs/xdgmime.h -@@ -97,12 +97,15 @@ int xdg_mime_register_reload_ca - void xdg_mime_remove_callback (int callback_id); - - /* Private versions of functions that don't call xdg_mime_init () */ -+#define _xdg_mime_mime_type_equal _gnomevfs_xdg_mime_mime_type_equal - int _xdg_mime_mime_type_equal (const char *mime_a, - const char *mime_b); - int _xdg_mime_media_type_equal (const char *mime_a, - const char *mime_b); -+#define _xdg_mime_mime_type_subclass _gnomevfs_xdg_mime_mime_type_subclass - int _xdg_mime_mime_type_subclass (const char *mime, - const char *base); -+#define _xdg_mime_unalias_mime_type _gnomevfs_xdg_mime_unalias_mime_type - const char *_xdg_mime_unalias_mime_type (const char *mime); - - diff --git a/sysutils/gnome-vfs2/patches/patch-cb b/sysutils/gnome-vfs2/patches/patch-cb deleted file mode 100644 index 3e8c7b351f0..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-cb +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cb,v 1.2 2007/04/10 17:58:24 drochner Exp $ - ---- modules/file-method-acl.c.orig 2007-03-13 11:50:03.000000000 +0100 -+++ modules/file-method-acl.c -@@ -35,6 +35,9 @@ - #include <stdlib.h> - #include <sys/types.h> - #ifdef HAVE_SYS_RESOURCE_H -+#ifdef HAVE_SYS_TIME_H -+#include <sys/time.h> /* <sys/resource.h> needs this on MacOS X */ -+#endif - #include <sys/resource.h> - #endif - diff --git a/sysutils/gnome-vfs2/patches/patch-cc b/sysutils/gnome-vfs2/patches/patch-cc deleted file mode 100644 index 9b4932c2e52..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2007/02/09 19:06:54 drochner Exp $ - ---- libgnomevfs/xdgmimealias.h.orig 2007-02-09 19:26:28.000000000 +0100 -+++ libgnomevfs/xdgmimealias.h -@@ -45,6 +45,7 @@ XdgAliasList *_xdg_mime_alias_list_new - void _xdg_mime_alias_list_free (XdgAliasList *list); - const char *_xdg_mime_alias_list_lookup (XdgAliasList *list, - const char *alias); -+#define _xdg_mime_alias_list_dump _gnomevfs_xdg_mime_alias_list_dump - void _xdg_mime_alias_list_dump (XdgAliasList *list); - - #endif /* __XDG_MIME_ALIAS_H__ */ diff --git a/sysutils/gnome-vfs2/patches/patch-cd b/sysutils/gnome-vfs2/patches/patch-cd deleted file mode 100644 index f2208eacf50..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-cd +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2007/02/09 19:06:54 drochner Exp $ - ---- libgnomevfs/xdgmimecache.h.orig 2007-02-09 19:29:40.000000000 +0100 -+++ libgnomevfs/xdgmimecache.h -@@ -44,20 +44,27 @@ XdgMimeCache *_xdg_mime_cache_ref - void _xdg_mime_cache_unref (XdgMimeCache *cache); - - -+#define _xdg_mime_cache_get_mime_type_for_data _gnomevfs_xdg_mime_cache_get_mime_type_for_data - const char *_xdg_mime_cache_get_mime_type_for_data (const void *data, - size_t len); -+#define _xdg_mime_cache_get_mime_type_for_file _gnomevfs_xdg_mime_cache_get_mime_type_for_file - const char *_xdg_mime_cache_get_mime_type_for_file (const char *file_name, - struct stat *statbuf); -+#define _xdg_mime_cache_get_mime_type_from_file_name _gnomevfs_xdg_mime_cache_get_mime_type_from_file_name - const char *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name); - int _xdg_mime_cache_is_valid_mime_type (const char *mime_type); - int _xdg_mime_cache_mime_type_equal (const char *mime_a, - const char *mime_b); - int _xdg_mime_cache_media_type_equal (const char *mime_a, - const char *mime_b); -+#define _xdg_mime_cache_mime_type_subclass _gnomevfs_xdg_mime_cache_mime_type_subclass - int _xdg_mime_cache_mime_type_subclass (const char *mime_a, - const char *mime_b); -+#define _xdg_mime_cache_list_mime_parents _gnomevfs_xdg_mime_cache_list_mime_parents - char **_xdg_mime_cache_list_mime_parents (const char *mime); -+#define _xdg_mime_cache_unalias_mime_type _gnomevfs_xdg_mime_cache_unalias_mime_type - const char *_xdg_mime_cache_unalias_mime_type (const char *mime); -+#define _xdg_mime_cache_get_max_buffer_extents _gnomevfs_xdg_mime_cache_get_max_buffer_extents - int _xdg_mime_cache_get_max_buffer_extents (void); - - #endif /* __XDG_MIME_CACHE_H__ */ diff --git a/sysutils/gnome-vfs2/patches/patch-ce b/sysutils/gnome-vfs2/patches/patch-ce deleted file mode 100644 index 6f5d03d3fe5..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ce +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2007/02/09 19:06:54 drochner Exp $ - ---- libgnomevfs/xdgmimeparent.h.orig 2007-02-09 19:28:49.000000000 +0100 -+++ libgnomevfs/xdgmimeparent.h -@@ -45,6 +45,7 @@ XdgParentList *_xdg_mime_parent_list_new - void _xdg_mime_parent_list_free (XdgParentList *list); - const char **_xdg_mime_parent_list_lookup (XdgParentList *list, - const char *mime); -+#define _xdg_mime_parent_list_dump _gnomevfs_xdg_mime_parent_list_dump - void _xdg_mime_parent_list_dump (XdgParentList *list); - - #endif /* __XDG_MIME_PARENT_H__ */ |