diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-04-27 05:23:07 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-04-27 05:23:07 +0800 |
commit | 65b53dfde8bfeb6ae17c3e99a409dc36324e8dd9 (patch) | |
tree | 0648e0ce504a559632af430d3494fe2008d104aa /graphics/eog | |
parent | 613b43090f18ebf78cb6ffd8eac82a763a0ce226 (diff) | |
download | marcuscom-ports-65b53dfde8bfeb6ae17c3e99a409dc36324e8dd9.tar.gz marcuscom-ports-65b53dfde8bfeb6ae17c3e99a409dc36324e8dd9.tar.zst marcuscom-ports-65b53dfde8bfeb6ae17c3e99a409dc36324e8dd9.zip |
Massive port framework maintaince/update (long over due too)
Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18393 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics/eog')
-rw-r--r-- | graphics/eog/Makefile | 30 | ||||
-rw-r--r-- | graphics/eog/pkg-plist | 2 |
2 files changed, 9 insertions, 23 deletions
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 54b79c130..65ba0c4ba 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: eog2 -# Date created: 21 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/trunk/graphics/eog/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= eog PORTVERSION= 2.32.1 @@ -16,20 +12,17 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The Eye Of Gnome image viewer -BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info -RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ - update-mime-database:${PORTSDIR}/misc/shared-mime-info +BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme CONFLICTS= eog-3.[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \ - gconf2 gnomedesktop +USE_GNOME= gnomeprefix intlhack librsvg2 gconf2 gnomedesktop WANT_GNOME= yes INSTALLS_ICONS= yes -USE_GETTEXT= yes +USES= gettext pathfix desktop-file-utils shared-mime-info pkgconfig INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -37,14 +30,12 @@ LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= eog.schemas -.include <bsd.port.pre.mk> - _WITH_EXIF= no _WITH_EXEMPI= no .if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \ defined(WITH_EXIF)) -LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif +LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif PLIST_SUB+= EXIF="" _WITH_EXIF= yes .else @@ -53,7 +44,7 @@ PLIST_SUB+= EXIF="@comment " .if !defined(WITHOUT_EXEMPI) || (exists(${LOCALBASE}/lib/libexempi.so)) || \ defined(WITH_EXEMPI) -LIB_DEPENDS+= exempi.3:${PORTSDIR}/textproc/exempi +LIB_DEPENDS+= exempi:${PORTSDIR}/textproc/exempi _WITH_EXEMPI= yes .endif @@ -70,7 +61,4 @@ CONFIGURE_ARGS+=--enable-python CONFIGURE_ARGS+=--disable-python .endif -post-install: - @-update-desktop-database > /dev/null - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 92f6c69b2..e0818f7b2 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -411,8 +411,6 @@ share/omf/eog/eog-zh_TW.omf @dirrm lib/eog @dirrm include/eog-2.20/eog @dirrm include/eog-2.20 -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES |