From 84588078623c9292da6fd54ec9b30c3048fb7f28 Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 5 May 2013 19:49:01 +0000 Subject: Merged into ports. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18418 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/desktop-file-utils/Makefile | 50 ---------- devel/desktop-file-utils/distinfo | 2 - .../files/patch-src_update-desktop-database.c | 32 ------- devel/desktop-file-utils/files/pkg-deinstall.in | 21 ---- devel/desktop-file-utils/files/pkg-install.in | 17 ---- devel/desktop-file-utils/pkg-descr | 4 - devel/desktop-file-utils/pkg-plist | 5 - misc/shared-mime-info/Makefile | 40 -------- misc/shared-mime-info/distinfo | 2 - .../files/patch-update-mime-database.c | 21 ---- misc/shared-mime-info/files/pkg-install.in | 12 --- misc/shared-mime-info/pkg-descr | 6 -- misc/shared-mime-info/pkg-plist | 106 --------------------- 13 files changed, 318 deletions(-) delete mode 100644 devel/desktop-file-utils/Makefile delete mode 100644 devel/desktop-file-utils/distinfo delete mode 100644 devel/desktop-file-utils/files/patch-src_update-desktop-database.c delete mode 100644 devel/desktop-file-utils/files/pkg-deinstall.in delete mode 100644 devel/desktop-file-utils/files/pkg-install.in delete mode 100644 devel/desktop-file-utils/pkg-descr delete mode 100644 devel/desktop-file-utils/pkg-plist delete mode 100644 misc/shared-mime-info/Makefile delete mode 100644 misc/shared-mime-info/distinfo delete mode 100644 misc/shared-mime-info/files/patch-update-mime-database.c delete mode 100644 misc/shared-mime-info/files/pkg-install.in delete mode 100644 misc/shared-mime-info/pkg-descr delete mode 100644 misc/shared-mime-info/pkg-plist diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile deleted file mode 100644 index 13ace6d7c..000000000 --- a/devel/desktop-file-utils/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# Created by: Jean-Yves Lefort -# $FreeBSD$ -# $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $ - -PORTNAME= desktop-file-utils -PORTVERSION= 0.21 -CATEGORIES= devel -MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/ - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A couple of command line utilities for working with desktop entries - -USE_GNOME= glib20 -USE_XZ= yes -USES= gettext pkgconfig -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-lispdir -CONFIGURE_ENV= EMACS="no" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -MAN1= desktop-file-edit.1 desktop-file-install.1 \ - desktop-file-validate.1 update-desktop-database.1 - -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - -PORT_MIMEDIRS= ${LOCALBASE}/share/applications - -MIMEDIRS= ${PORT_MIMEDIRS} - -RMDIRS= ${PORT_MIMEDIRS} - -post-patch: - @${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\ - s|%%RMDIRS%%|${RMDIRS}| ; \ - s|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \ - < ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - @${SED} -e 's|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \ - < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - -post-install: - ${INSTALL_DATA} ${WRKSRC}/misc/desktop-entry-mode.el \ - ${PREFIX}/share/emacs/site-lisp/desktop-entry-mode.el -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - -.include diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo deleted file mode 100644 index b5a1c818b..000000000 --- a/devel/desktop-file-utils/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (desktop-file-utils-0.21.tar.xz) = b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b -SIZE (desktop-file-utils-0.21.tar.xz) = 128972 diff --git a/devel/desktop-file-utils/files/patch-src_update-desktop-database.c b/devel/desktop-file-utils/files/patch-src_update-desktop-database.c deleted file mode 100644 index 793083caf..000000000 --- a/devel/desktop-file-utils/files/patch-src_update-desktop-database.c +++ /dev/null @@ -1,32 +0,0 @@ -From f0a269e1d65843822915faa1bb020da8b6b9954c Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Mon, 07 Jan 2013 08:02:08 +0000 -Subject: update-desktop-database: List only once a desktop file per mime type - -If a desktop file is registering the same mime type more than once -(useless but okay), the desktop file was listed more than once for that -mime type in mimeinfo.cache. - -It's easy to avoid, so make sure we only have a desktop file once per -mime type. ---- -diff --git a/src/update-desktop-database.c b/src/update-desktop-database.c -index ffc1440..7f48357 100644 ---- src/update-desktop-database.c -+++ src/update-desktop-database.c -@@ -83,6 +83,13 @@ cache_desktop_file (const char *desktop_file, - - desktop_files = (GList *) g_hash_table_lookup (mime_types_map, mime_type); - -+ /* do not add twice a desktop file mentioning the mime type more than once -+ * (no need to use g_list_find() because we cache all mime types registered -+ * by a desktop file before moving to another desktop file) */ -+ if (desktop_files && -+ strcmp (desktop_file, (const char *) desktop_files->data) == 0) -+ return; -+ - desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file)); - g_hash_table_insert (mime_types_map, g_strdup (mime_type), desktop_files); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/devel/desktop-file-utils/files/pkg-deinstall.in b/devel/desktop-file-utils/files/pkg-deinstall.in deleted file mode 100644 index dc9fbc711..000000000 --- a/devel/desktop-file-utils/files/pkg-deinstall.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Remove leftover mimeinfo.cache files. - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -for mdir in %%MIMEDIRS%%; do - if [ -f ${mdir}/mimeinfo.cache ]; then - rm -f ${mdir}/mimeinfo.cache - fi -done - -for pmdir in $(echo %%RMDIRS%% | sort -r); do - rmdir ${pmdir} 2>/dev/null -done - -exit 0 diff --git a/devel/desktop-file-utils/files/pkg-install.in b/devel/desktop-file-utils/files/pkg-install.in deleted file mode 100644 index bafaa46a1..000000000 --- a/devel/desktop-file-utils/files/pkg-install.in +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Initialize the desktop directories and MIME cache. - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -for pmdir in %%PORT_MIMEDIRS%%; do - mkdir -p ${pmdir} -done - -${PKG_PREFIX}/bin/update-desktop-database -q - -exit 0 diff --git a/devel/desktop-file-utils/pkg-descr b/devel/desktop-file-utils/pkg-descr deleted file mode 100644 index 5ea717bb3..000000000 --- a/devel/desktop-file-utils/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -desktop-file-utils contains a couple of command line utilities for -working with desktop entries, as well as a menu module for GnomeVFS. - -WWW: http://www.freedesktop.org/Software/desktop-file-utils diff --git a/devel/desktop-file-utils/pkg-plist b/devel/desktop-file-utils/pkg-plist deleted file mode 100644 index ea1ca1207..000000000 --- a/devel/desktop-file-utils/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/desktop-file-edit -bin/desktop-file-install -bin/desktop-file-validate -bin/update-desktop-database -share/emacs/site-lisp/desktop-entry-mode.el diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile deleted file mode 100644 index e859bd71a..000000000 --- a/misc/shared-mime-info/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: olgeni@FreeBSD.org -# $FreeBSD: head/misc/shared-mime-info/Makefile 314767 2013-03-20 21:45:00Z kwm $ -# $MCom$ - -PORTNAME= shared-mime-info -PORTVERSION= 1.1 -CATEGORIES= misc gnome -MASTER_SITES= http://people.freedesktop.org/~hadess/ - -MAINTAINER= gnome@FreeBSD.org -COMMENT= MIME types database from the freedesktop.org project - -USE_XZ= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-update-mimedb -USES= gettext pathfix pkgconfig -USE_GMAKE= yes -USE_GNOME= glib20 libxml2 intltool intlhack -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -#MAKE_JOBS_UNSAFE= yes - -MAN1= update-mime-database.1 - -SUB_FILES= pkg-install -SUB_LIST= MIMEDIRS="${MIMEDIRS:O:u}" - -MIMEDIRS= ${LOCALBASE}/share/mime \ - ${PREFIX}/share/mime -MIMESUBDIRS= application audio image inode message model multipart \ - packages text video x-epoc x-content - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/update-mime-database.c - -post-install: - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo deleted file mode 100644 index 492b651d4..000000000 --- a/misc/shared-mime-info/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (shared-mime-info-1.1.tar.xz) = 184d094b157a9ec2607ad26a1a1837e6e07f3fcbeb38d8b6d412906156f9e06c -SIZE (shared-mime-info-1.1.tar.xz) = 506660 diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c deleted file mode 100644 index 3fb1a99b8..000000000 --- a/misc/shared-mime-info/files/patch-update-mime-database.c +++ /dev/null @@ -1,21 +0,0 @@ ---- update-mime-database.c.orig 2007-07-02 04:00:13.000000000 -0500 -+++ update-mime-database.c 2008-01-28 23:42:30.000000000 -0600 -@@ -445,7 +446,8 @@ - } - } - -- xmlFree(lang); -+ if (lang) -+ xmlFree(lang); - } - - /* 'node' is a node from a source file, whose type is 'type'. -@@ -1510,7 +1512,7 @@ - - env = getenv("XDG_DATA_DIRS"); - if (!env) -- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; -+ env = "/usr/local/share/"; - dirs = g_strsplit(env, PATH_SEPARATOR, 0); - g_return_if_fail(dirs != NULL); - for (n = 0; dirs[n]; n++) diff --git a/misc/shared-mime-info/files/pkg-install.in b/misc/shared-mime-info/files/pkg-install.in deleted file mode 100644 index b2c3db6d3..000000000 --- a/misc/shared-mime-info/files/pkg-install.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - for mdir in %%MIMEDIRS%%; do - if [ -d ${mdir} ]; then - %%PREFIX%%/bin/update-mime-database ${mdir} - fi - done - exit 0 - ;; -esac diff --git a/misc/shared-mime-info/pkg-descr b/misc/shared-mime-info/pkg-descr deleted file mode 100644 index 852d2904d..000000000 --- a/misc/shared-mime-info/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -The freedesktop.org project provides a shared MIME database to avoid -inconsistencies between desktops. This database has been created by -converting the existing KDE and GNOME databases to a common format and -merging them together. - -WWW: http://www.freedesktop.org/wiki/Software/shared-mime-info diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist deleted file mode 100644 index a8bed26fb..000000000 --- a/misc/shared-mime-info/pkg-plist +++ /dev/null @@ -1,106 +0,0 @@ -bin/update-mime-database -libdata/pkgconfig/shared-mime-info.pc -share/locale/ar/LC_MESSAGES/shared-mime-info.mo -share/locale/az/LC_MESSAGES/shared-mime-info.mo -share/locale/be@latin/LC_MESSAGES/shared-mime-info.mo -share/locale/bg/LC_MESSAGES/shared-mime-info.mo -share/locale/bg_BG/LC_MESSAGES/shared-mime-info.mo -share/locale/bn_IN/LC_MESSAGES/shared-mime-info.mo -share/locale/ca/LC_MESSAGES/shared-mime-info.mo -share/locale/ca@valencia/LC_MESSAGES/shared-mime-info.mo -share/locale/cs/LC_MESSAGES/shared-mime-info.mo -share/locale/cy/LC_MESSAGES/shared-mime-info.mo -share/locale/da/LC_MESSAGES/shared-mime-info.mo -share/locale/de/LC_MESSAGES/shared-mime-info.mo -share/locale/el/LC_MESSAGES/shared-mime-info.mo -share/locale/en_GB/LC_MESSAGES/shared-mime-info.mo -share/locale/eo/LC_MESSAGES/shared-mime-info.mo -share/locale/es/LC_MESSAGES/shared-mime-info.mo -share/locale/eu/LC_MESSAGES/shared-mime-info.mo -share/locale/fa/LC_MESSAGES/shared-mime-info.mo -share/locale/fa_IR/LC_MESSAGES/shared-mime-info.mo -share/locale/fi/LC_MESSAGES/shared-mime-info.mo -share/locale/fo/LC_MESSAGES/shared-mime-info.mo -share/locale/fr/LC_MESSAGES/shared-mime-info.mo -share/locale/ga/LC_MESSAGES/shared-mime-info.mo -share/locale/gl/LC_MESSAGES/shared-mime-info.mo -share/locale/he/LC_MESSAGES/shared-mime-info.mo -share/locale/hi/LC_MESSAGES/shared-mime-info.mo -share/locale/hr/LC_MESSAGES/shared-mime-info.mo -share/locale/hu/LC_MESSAGES/shared-mime-info.mo -share/locale/ia/LC_MESSAGES/shared-mime-info.mo -share/locale/id/LC_MESSAGES/shared-mime-info.mo -share/locale/it/LC_MESSAGES/shared-mime-info.mo -share/locale/ja/LC_MESSAGES/shared-mime-info.mo -share/locale/ka/LC_MESSAGES/shared-mime-info.mo -share/locale/kk/LC_MESSAGES/shared-mime-info.mo -share/locale/ko/LC_MESSAGES/shared-mime-info.mo -share/locale/lt/LC_MESSAGES/shared-mime-info.mo -share/locale/lv/LC_MESSAGES/shared-mime-info.mo -share/locale/ms/LC_MESSAGES/shared-mime-info.mo -share/locale/nb/LC_MESSAGES/shared-mime-info.mo -share/locale/nl/LC_MESSAGES/shared-mime-info.mo -share/locale/nn/LC_MESSAGES/shared-mime-info.mo -share/locale/pa/LC_MESSAGES/shared-mime-info.mo -share/locale/pl/LC_MESSAGES/shared-mime-info.mo -share/locale/pt/LC_MESSAGES/shared-mime-info.mo -share/locale/pt_BR/LC_MESSAGES/shared-mime-info.mo -share/locale/ro/LC_MESSAGES/shared-mime-info.mo -share/locale/ru/LC_MESSAGES/shared-mime-info.mo -share/locale/rw/LC_MESSAGES/shared-mime-info.mo -share/locale/sk/LC_MESSAGES/shared-mime-info.mo -share/locale/sl/LC_MESSAGES/shared-mime-info.mo -share/locale/sq/LC_MESSAGES/shared-mime-info.mo -share/locale/sr/LC_MESSAGES/shared-mime-info.mo -share/locale/sr@latin/LC_MESSAGES/shared-mime-info.mo -share/locale/sv/LC_MESSAGES/shared-mime-info.mo -share/locale/te/LC_MESSAGES/shared-mime-info.mo -share/locale/tr/LC_MESSAGES/shared-mime-info.mo -share/locale/uk/LC_MESSAGES/shared-mime-info.mo -share/locale/vi/LC_MESSAGES/shared-mime-info.mo -share/locale/wa/LC_MESSAGES/shared-mime-info.mo -share/locale/zh_CN/LC_MESSAGES/shared-mime-info.mo -share/locale/zh_HK/LC_MESSAGES/shared-mime-info.mo -share/locale/zh_TW/LC_MESSAGES/shared-mime-info.mo -share/mime/packages/freedesktop.org.xml -@rmtry share/mime/XMLnamespaces -@rmtry share/mime/aliases -@rmtry share/mime/generic-icons -@rmtry share/mime/globs -@rmtry share/mime/globs2 -@rmtry share/mime/icons -@rmtry share/mime/magic -@rmtry share/mime/mime.cache -@rmtry share/mime/subclasses -@rmtry share/mime/treemagic -@rmtry share/mime/types -@rmtry share/mime/version -@unexec rm -fr %D/share/mime/x-epoc 2>/dev/null || true -@unexec rm -fr %D/share/mime/x-content 2>/dev/null || true -@unexec rm -fr %D/share/mime/video 2>/dev/null || true -@unexec rm -fr %D/share/mime/text 2>/dev/null || true -@dirrmtry share/mime/packages -@unexec rm -fr %D/share/mime/multipart 2>/dev/null || true -@unexec rm -fr %D/share/mime/model 2>/dev/null || true -@unexec rm -fr %D/share/mime/message 2>/dev/null || true -@unexec rm -fr %D/share/mime/inode 2>/dev/null || true -@unexec rm -fr %D/share/mime/image 2>/dev/null || true -@unexec rm -fr %D/share/mime/audio 2>/dev/null || true -@unexec rm -fr %D/share/mime/application 2>/dev/null || true -@dirrmtry share/mime -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/kk/LC_MESSAGES -@dirrmtry share/locale/kk -@dirrmtry share/locale/ia/LC_MESSAGES -@dirrmtry share/locale/ia -@dirrmtry share/locale/fo/LC_MESSAGES -@dirrmtry share/locale/fo -@dirrmtry share/locale/bg_BG/LC_MESSAGES -@dirrmtry share/locale/bg_BG -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -- cgit v1.2.3