From ed2c59286c6041c5d09a9d939c90c770179c970c Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 12 Feb 2004 01:24:55 +0000 Subject: * Update to 2.5.7 * Clean up the KDE menus, and add a new KDE sub-menu for storing all the KDE desktop icons. Big thanks to Jeremy Messenger for providing this. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1812 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 17 +- devel/gnome-vfs/distinfo | 3 +- devel/gnome-vfs/files/KDE.directory | 5 + ..._vfolder_applications-all-users.vfolder-info.in | 270 ++++++++++++++++++++- devel/gnome-vfs/files/patch-aa | 14 +- .../files/patch-libgnomevfs_gnome-vfs-volume-ops.c | 26 -- devel/gnome-vfs/pkg-plist | 52 +++- devel/gnomevfs2/Makefile | 17 +- devel/gnomevfs2/distinfo | 3 +- devel/gnomevfs2/files/KDE.directory | 5 + ..._vfolder_applications-all-users.vfolder-info.in | 270 ++++++++++++++++++++- devel/gnomevfs2/files/patch-aa | 14 +- .../files/patch-libgnomevfs_gnome-vfs-volume-ops.c | 26 -- devel/gnomevfs2/pkg-plist | 52 +++- 14 files changed, 684 insertions(+), 90 deletions(-) create mode 100644 devel/gnome-vfs/files/KDE.directory delete mode 100644 devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c create mode 100644 devel/gnomevfs2/files/KDE.directory delete mode 100644 devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c (limited to 'devel') diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index e10ad2ba6..1b584b55c 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.5.6 -PORTREVISION= 4 +PORTVERSION= 2.5.7 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 @@ -27,6 +26,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --disable-openssl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} @@ -44,6 +44,9 @@ WITH_SAMBA= yes .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in +PLIST_SUB+= KDEMENUS="" +.else +PLIST_SUB+= KDEMENUS="@comment " .endif .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) @@ -79,7 +82,17 @@ post-patch: ${WRKSRC}/libgnomevfs/Makefile.in \ ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in +.if !defined(WITHOUT_KDE_MENUS) + @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ + < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory +.endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in +post-install: + @${MKDIR} ${PREFIX}/share/gnome/vfolders +.if !defined(WITHOUT_KDE_MENUS) + @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders +.endif + .include diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index ea5e2f26e..c4cfe7cb8 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.5.6.tar.bz2) = b0a1c88e684cff42d14bb93cf13645bf +MD5 (gnome2/gnome-vfs-2.5.7.tar.bz2) = c25084af618d080d49ea0db58022fc56 +SIZE (gnome2/gnome-vfs-2.5.7.tar.bz2) = 1386526 diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory new file mode 100644 index 000000000..032126bb9 --- /dev/null +++ b/devel/gnome-vfs/files/KDE.directory @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KDE +Comment=Some comment about KDE menu +Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png +Type=Directory diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in index 17774279b..432558f80 100644 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -1,5 +1,5 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004 +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Tue Feb 10 19:49:19 2004 ++++ modules/vfolder/applications-all-users.vfolder-info.in Tue Feb 10 19:59:22 2004 @@ -19,7 +19,14 @@ /usr/share/gnome/apps/ @@ -16,3 +16,269 @@ +@@ -34,10 +41,12 @@ + + + Core +- +- ++ ++ ++ Qt ++ KDE ++ ++ + + + +@@ -47,6 +56,12 @@ + Accessories.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Utility + +@@ -63,6 +78,12 @@ + Accessibility.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Accessibility + +@@ -80,6 +101,12 @@ + + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Settings +@@ -101,6 +128,12 @@ + Development.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Development + +@@ -114,6 +147,12 @@ + Games.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Game + +@@ -127,6 +166,12 @@ + Graphics.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Graphics + +@@ -140,6 +185,12 @@ + Internet.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Network + +@@ -153,6 +204,12 @@ + Multimedia.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + AudioVideo + +@@ -170,6 +227,12 @@ + Office.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Office +@@ -195,6 +258,12 @@ + System.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Settings +@@ -204,6 +273,117 @@ + + + +- ++ ++ ++ ++ KDE ++ KDE.directory ++ ++ ++ ++ Accessories ++ Accessories.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Utility ++ ++ ++ ++ ++ ++ ++ ++ Programming ++ Development.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Development ++ ++ ++ ++ ++ ++ ++ ++ Graphics ++ Graphics.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Graphics ++ ++ ++ ++ ++ ++ ++ ++ Internet ++ Internet.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Network ++ ++ ++ ++ /usr/local/share/applnk/konqueror.desktop ++ ++ ++ ++ ++ ++ ++ Multimedia ++ Multimedia.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ AudioVideo ++ ++ ++ ++ ++ ++ ++ ++ Office ++ Office.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ ++ Office ++ Spreadsheet ++ WordProcessor ++ Calendar ++ ProjectManagement ++ ++ ++ ++ ++ ++ ++ + + diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index ba863aab1..8273ab3fe 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -55,22 +55,10 @@ else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27613,9 +27617,9 @@ - - msg_openssl="yes" - if test x$with_openssl_libs != x/usr/lib; then -- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto" -+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo" - else -- OPENSSL_LIBS="-lssl -lcrypto" -+ OPENSSL_LIBS="-lssl -lcryptofoo" - fi - - @@ -30543,6 +30547,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c deleted file mode 100644 index 87e2eca65..000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c +++ /dev/null @@ -1,26 +0,0 @@ ---- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 24 13:53:43 2003 -+++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 24 13:56:15 2003 -@@ -224,12 +224,23 @@ - } - - if (info->should_eject) { -+#ifdef __FreeBSD__ -+ char *argv[5] = { -+ "cdcontrol", -+ "-f", -+ NULL, -+ "eject", -+ NULL -+ }; -+ argv[2] = info->device_path?info->device_path:info->mount_point; -+#else - char *argv[3] = { - "eject", - NULL, - NULL - }; - argv[1] = info->device_path?info->device_path:info->mount_point; -+#endif - - if (g_spawn_sync (NULL, - argv, diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 2e189c416..14238fc60 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -142,11 +142,59 @@ libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon -share/doc/gnome-vfs-2.0/core.3396 +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/home.png share/doc/gnome-vfs-2.0/left.png share/doc/gnome-vfs-2.0/right.png share/doc/gnome-vfs-2.0/up.png +%%KDEMENUS%%share/gnome/vfolders/KDE.directory 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 @@ -171,6 +219,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/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 @@ -209,6 +258,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 +@dirrm share/gnome/vfolders @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index e10ad2ba6..1b584b55c 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.5.6 -PORTREVISION= 4 +PORTVERSION= 2.5.7 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 @@ -27,6 +26,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --disable-openssl CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} @@ -44,6 +44,9 @@ WITH_SAMBA= yes .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in +PLIST_SUB+= KDEMENUS="" +.else +PLIST_SUB+= KDEMENUS="@comment " .endif .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) @@ -79,7 +82,17 @@ post-patch: ${WRKSRC}/libgnomevfs/Makefile.in \ ${WRKSRC}/libgnomevfs/xdgmime.c \ ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in +.if !defined(WITHOUT_KDE_MENUS) + @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ + < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory +.endif @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ ${WRKSRC}/Makefile.in +post-install: + @${MKDIR} ${PREFIX}/share/gnome/vfolders +.if !defined(WITHOUT_KDE_MENUS) + @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders +.endif + .include diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index ea5e2f26e..c4cfe7cb8 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.5.6.tar.bz2) = b0a1c88e684cff42d14bb93cf13645bf +MD5 (gnome2/gnome-vfs-2.5.7.tar.bz2) = c25084af618d080d49ea0db58022fc56 +SIZE (gnome2/gnome-vfs-2.5.7.tar.bz2) = 1386526 diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory new file mode 100644 index 000000000..032126bb9 --- /dev/null +++ b/devel/gnomevfs2/files/KDE.directory @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=KDE +Comment=Some comment about KDE menu +Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png +Type=Directory diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in index 17774279b..432558f80 100644 --- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -1,5 +1,5 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004 -+++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004 +--- modules/vfolder/applications-all-users.vfolder-info.in.orig Tue Feb 10 19:49:19 2004 ++++ modules/vfolder/applications-all-users.vfolder-info.in Tue Feb 10 19:59:22 2004 @@ -19,7 +19,14 @@ /usr/share/gnome/apps/ @@ -16,3 +16,269 @@ +@@ -34,10 +41,12 @@ + + + Core +- +- ++ ++ ++ Qt ++ KDE ++ ++ + + + +@@ -47,6 +56,12 @@ + Accessories.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Utility + +@@ -63,6 +78,12 @@ + Accessibility.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Accessibility + +@@ -80,6 +101,12 @@ + + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Settings +@@ -101,6 +128,12 @@ + Development.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Development + +@@ -114,6 +147,12 @@ + Games.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Game + +@@ -127,6 +166,12 @@ + Graphics.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Graphics + +@@ -140,6 +185,12 @@ + Internet.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + Network + +@@ -153,6 +204,12 @@ + Multimedia.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + AudioVideo + +@@ -170,6 +227,12 @@ + Office.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Office +@@ -195,6 +258,12 @@ + System.directory + + ++ ++ ++ Qt ++ KDE ++ ++ + Application + + Settings +@@ -204,6 +273,117 @@ + + + +- ++ ++ ++ ++ KDE ++ KDE.directory ++ ++ ++ ++ Accessories ++ Accessories.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Utility ++ ++ ++ ++ ++ ++ ++ ++ Programming ++ Development.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Development ++ ++ ++ ++ ++ ++ ++ ++ Graphics ++ Graphics.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Graphics ++ ++ ++ ++ ++ ++ ++ ++ Internet ++ Internet.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ Network ++ ++ ++ ++ /usr/local/share/applnk/konqueror.desktop ++ ++ ++ ++ ++ ++ ++ Multimedia ++ Multimedia.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ AudioVideo ++ ++ ++ ++ ++ ++ ++ ++ Office ++ Office.directory ++ ++ ++ ++ Qt ++ KDE ++ ++ ++ Office ++ Spreadsheet ++ WordProcessor ++ Calendar ++ ProjectManagement ++ ++ ++ ++ ++ ++ ++ + + diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index ba863aab1..8273ab3fe 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -55,22 +55,10 @@ else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27613,9 +27617,9 @@ - - msg_openssl="yes" - if test x$with_openssl_libs != x/usr/lib; then -- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto" -+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo" - else -- OPENSSL_LIBS="-lssl -lcrypto" -+ OPENSSL_LIBS="-lssl -lcryptofoo" - fi - - @@ -30543,6 +30547,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c deleted file mode 100644 index 87e2eca65..000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c +++ /dev/null @@ -1,26 +0,0 @@ ---- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 24 13:53:43 2003 -+++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 24 13:56:15 2003 -@@ -224,12 +224,23 @@ - } - - if (info->should_eject) { -+#ifdef __FreeBSD__ -+ char *argv[5] = { -+ "cdcontrol", -+ "-f", -+ NULL, -+ "eject", -+ NULL -+ }; -+ argv[2] = info->device_path?info->device_path:info->mount_point; -+#else - char *argv[3] = { - "eject", - NULL, - NULL - }; - argv[1] = info->device_path?info->device_path:info->mount_point; -+#endif - - if (g_spawn_sync (NULL, - argv, diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 2e189c416..14238fc60 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -142,11 +142,59 @@ libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc libexec/gnome-vfs-daemon -share/doc/gnome-vfs-2.0/core.3396 +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/home.png share/doc/gnome-vfs-2.0/left.png share/doc/gnome-vfs-2.0/right.png share/doc/gnome-vfs-2.0/up.png +%%KDEMENUS%%share/gnome/vfolders/KDE.directory 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 @@ -171,6 +219,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/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 @@ -209,6 +258,7 @@ share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 +@dirrm share/gnome/vfolders @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 @dirrm include/gnome-vfs-module-2.0/libgnomevfs -- cgit v1.2.3