diff options
| -rw-r--r-- | graphics/shotwell/Makefile | 21 | ||||
| -rw-r--r-- | graphics/shotwell/distinfo | 7 | ||||
| -rw-r--r-- | graphics/shotwell/files/patch-Makefile | 35 | ||||
| -rw-r--r-- | graphics/shotwell/pkg-plist | 69 |
4 files changed, 96 insertions, 36 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index de24a4149ed8..a7fce1f2107c 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -6,7 +6,7 @@ # PORTNAME= shotwell -PORTVERSION= 0.6.1 +PORTVERSION= 0.7.2 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ @@ -14,7 +14,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Open source photo manager for GNOME BUILD_DEPENDS= ${LOCALBASE}/lib/libraw.a:${PORTSDIR}/graphics/libraw \ - vala>=0.8.0:${PORTSDIR}/lang/vala + vala>=0.10.0:${PORTSDIR}/lang/vala LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gee.2:${PORTSDIR}/devel/libgee \ @@ -22,25 +22,20 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ gexiv2.0:${PORTSDIR}/graphics/gexiv2 \ exif.12:${PORTSDIR}/graphics/libexif \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ - xml2.5:${PORTSDIR}/textproc/libxml2 \ webkit:${PORTSDIR}/www/webkit-gtk2 \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique -BROKEN= Doesn't build with vala-0.10 - USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gconf2 gtk20 desktopfileutils +USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2 USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-icon-update \ - --with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas \ - --disable-schemas-install + --with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas INSTALLS_ICONS= yes GCONF_SCHEMAS= shotwell.schemas -PORTDATA= * post-patch: @${REINPLACE_CMD} -E \ @@ -51,13 +46,17 @@ post-patch: post-configure: @${REINPLACE_CMD} -E \ - -e 's|share/shotwell|${DATADIR_REL}|' \ - ${WRKSRC}/${MAKEFILE} + -e 's|share/shotwell|${DATADIR_REL}|g ; \ + s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g' \ + ${WRKSRC}/${MAKEFILE} # attempt at a DATADIR safe port @${REINPLACE_CMD} -E \ -e 's|\.get_child\("share")\.get_child\("shotwell")|${SHOTWELL_DATADIR}|' \ ${WRKSRC}/src/AppDirs.vala +post-install: + @-update-desktop-database + .include <bsd.port.pre.mk> # graphics/libraw diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo index 8bae669b9931..ebb0689a4a3e 100644 --- a/graphics/shotwell/distinfo +++ b/graphics/shotwell/distinfo @@ -1,3 +1,4 @@ -MD5 (shotwell-0.6.1.tar.bz2) = 440436e8f1479a5da2599065705b0ca4 -SHA256 (shotwell-0.6.1.tar.bz2) = 01314373d35f05bcdc223eb06a0f21e76ae3e3e1d6628822816a147db1d534dc -SIZE (shotwell-0.6.1.tar.bz2) = 681013 +MD5 (shotwell-0.7.2.tar.bz2) = 075b04f9723bddfffc96810384b9524a +SHA256 (shotwell-0.7.2.tar.bz2) = 8b4139407d59badcbe13e23db070e0a0709ecc0f9ad806335888382eebf5dfa3 +SIZE (shotwell-0.7.2.tar.bz2) = 1064127 + diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile index 8ed9d2c60f61..3c54b9c27a36 100644 --- a/graphics/shotwell/files/patch-Makefile +++ b/graphics/shotwell/files/patch-Makefile @@ -1,7 +1,7 @@ ---- Makefile.orig 2010-06-30 15:44:06.000000000 -0300 -+++ Makefile 2010-09-07 10:51:40.000000000 -0300 +--- Makefile.orig 2010-09-10 17:55:54.000000000 -0500 ++++ Makefile 2010-12-28 16:15:44.000000000 -0600 @@ -21,6 +21,10 @@ - LINUX = 1 + LINUX = 1 endif +ifeq "$(SYSTEM)" "FreeBSD" @@ -9,10 +9,10 @@ +endif + ifeq "$(SYSTEM)" "MinGW" - WINDOWS = 1 + WINDOWS = 1 endif @@ -41,6 +45,10 @@ - EXPORT_FLAGS = -export-dynamic + EXPORT_FLAGS = -export-dynamic endif +ifdef FreeBSD @@ -20,11 +20,11 @@ +endif + ifdef WINDOWS - EXPORT_FLAGS = -export-all-symbols + EXPORT_FLAGS = -export-all-symbols endif -@@ -115,10 +123,13 @@ - PngSupport.vala \ - PhotoExporter.vala +@@ -124,10 +132,13 @@ + FSpotDatabaseDriver.vala \ + FSpotDatabaseTables.vala +# this should be ifndef LINUX && ifndef FreeBSD ifndef LINUX @@ -36,7 +36,7 @@ VAPI_FILES = \ libexif.vapi \ -@@ -223,6 +234,18 @@ +@@ -288,6 +299,18 @@ gdk-x11-2.0 endif @@ -55,7 +55,7 @@ # libraw is handled separately (see note below); when libraw-config is no longer needed, the version # should be added to this list EXT_PKG_VERSIONS = \ -@@ -247,6 +270,18 @@ +@@ -313,6 +336,18 @@ dbus-glib-1 >= 0.80 endif @@ -74,7 +74,7 @@ PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG) ifndef BUILD_DIR -@@ -288,6 +323,10 @@ +@@ -357,6 +392,10 @@ VALA_LDFLAGS = `pkg-config --libs $(EXT_PKGS) gthread-2.0` @@ -85,7 +85,7 @@ ifdef WINDOWS VALA_DEFINES = -D WINDOWS -D NO_CAMERA -D NO_PRINTING -D NO_PUBLISHING -D NO_LIBUNIQUE -D NO_EXTENDED_POSIX -D NO_SET_BACKGROUND EXPANDED_OBJ_FILES += src/windows.o -@@ -324,6 +363,11 @@ +@@ -393,6 +432,11 @@ LIBRAW_CONFIG=./libraw-config endif @@ -97,14 +97,13 @@ ifdef WINDOWS LIBRAW_CONFIG=./libraw-config --windows endif -@@ -413,9 +457,21 @@ - $(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks +@@ -488,9 +532,20 @@ + $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures endif endif +ifdef FreeBSD +ifndef DISABLE_SCHEMAS_INSTALL -+ GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas -+else ++ GCONF_CONFIG_SOURCE=%%GCONF_CONFIG_SOURCE%% gconftool-2 --makefile-install-rule misc/shotwell.schemas + mkdir -p $(DESTDIR)$(SCHEMA_FILE_DIR) + $(INSTALL_DATA) misc/shotwell.schemas $(DESTDIR)$(SCHEMA_FILE_DIR) +endif @@ -121,7 +120,7 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) -@@ -436,6 +492,16 @@ +@@ -514,6 +569,16 @@ rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py endif endif diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist index 9b0889a6e724..177898802d99 100644 --- a/graphics/shotwell/pkg-plist +++ b/graphics/shotwell/pkg-plist @@ -1,7 +1,12 @@ bin/shotwell +share/applications/shotwell-viewer.desktop +share/applications/shotwell.desktop +share/icons/hicolor/scalable/apps/shotwell.svg share/locale/ar/LC_MESSAGES/shotwell.mo +share/locale/ast/LC_MESSAGES/shotwell.mo share/locale/bg/LC_MESSAGES/shotwell.mo share/locale/bn/LC_MESSAGES/shotwell.mo +share/locale/ca/LC_MESSAGES/shotwell.mo share/locale/cs/LC_MESSAGES/shotwell.mo share/locale/da/LC_MESSAGES/shotwell.mo share/locale/de/LC_MESSAGES/shotwell.mo @@ -11,11 +16,14 @@ share/locale/es/LC_MESSAGES/shotwell.mo share/locale/et/LC_MESSAGES/shotwell.mo share/locale/fi/LC_MESSAGES/shotwell.mo share/locale/fr/LC_MESSAGES/shotwell.mo +share/locale/gl/LC_MESSAGES/shotwell.mo share/locale/hr/LC_MESSAGES/shotwell.mo share/locale/hu/LC_MESSAGES/shotwell.mo share/locale/id/LC_MESSAGES/shotwell.mo share/locale/it/LC_MESSAGES/shotwell.mo share/locale/ja/LC_MESSAGES/shotwell.mo +share/locale/kk/LC_MESSAGES/shotwell.mo +share/locale/ko/LC_MESSAGES/shotwell.mo share/locale/lt/LC_MESSAGES/shotwell.mo share/locale/lv/LC_MESSAGES/shotwell.mo share/locale/nb/LC_MESSAGES/shotwell.mo @@ -30,12 +38,65 @@ share/locale/sl/LC_MESSAGES/shotwell.mo share/locale/sr/LC_MESSAGES/shotwell.mo share/locale/sv/LC_MESSAGES/shotwell.mo share/locale/th/LC_MESSAGES/shotwell.mo +share/locale/tr/LC_MESSAGES/shotwell.mo share/locale/uk/LC_MESSAGES/shotwell.mo share/locale/zh_CN/LC_MESSAGES/shotwell.mo share/locale/zh_TW/LC_MESSAGES/shotwell.mo -share/locale/ast/LC_MESSAGES/shotwell.mo -share/icons/hicolor/scalable/apps/shotwell.svg -share/applications/shotwell.desktop -share/applications/shotwell-viewer.desktop +%%DATADIR%%/icons/all-rejected.png +%%DATADIR%%/icons/crop-pivot-reticle.png +%%DATADIR%%/icons/crop.svg +%%DATADIR%%/icons/drag_nub.png +%%DATADIR%%/icons/enhance.png +%%DATADIR%%/icons/five-star-filter.svg +%%DATADIR%%/icons/five-stars.svg +%%DATADIR%%/icons/four-star-filter-plus.svg +%%DATADIR%%/icons/four-stars.svg +%%DATADIR%%/icons/image-adjust.svg +%%DATADIR%%/icons/import-all.png +%%DATADIR%%/icons/import.svg +%%DATADIR%%/icons/last-import-roll.png +%%DATADIR%%/icons/make-primary.svg +%%DATADIR%%/icons/merge.svg +%%DATADIR%%/icons/multiple-events.png +%%DATADIR%%/icons/multiple-tags.png +%%DATADIR%%/icons/one-event.png +%%DATADIR%%/icons/one-star-filter-plus.svg +%%DATADIR%%/icons/one-star.svg +%%DATADIR%%/icons/one-tag.png +%%DATADIR%%/icons/pin-toolbar.svg +%%DATADIR%%/icons/publish.png +%%DATADIR%%/icons/redeye.png +%%DATADIR%%/icons/rejected.svg +%%DATADIR%%/icons/shotwell-16.svg +%%DATADIR%%/icons/shotwell-24.svg +%%DATADIR%%/icons/shotwell-street.jpg +%%DATADIR%%/icons/shotwell.ico +%%DATADIR%%/icons/shotwell.svg +%%DATADIR%%/icons/three-star-filter-plus.svg +%%DATADIR%%/icons/three-stars.svg +%%DATADIR%%/icons/two-star-filter-plus.svg +%%DATADIR%%/icons/two-stars.svg +%%DATADIR%%/icons/zoom-in.png +%%DATADIR%%/icons/zoom-out.png +%%DATADIR%%/ui/collection.ui +%%DATADIR%%/ui/direct.ui +%%DATADIR%%/ui/event.ui +%%DATADIR%%/ui/events_directory.ui +%%DATADIR%%/ui/fullscreen.ui +%%DATADIR%%/ui/import.ui +%%DATADIR%%/ui/import_queue.ui +%%DATADIR%%/ui/offline.ui +%%DATADIR%%/ui/photo.ui +%%DATADIR%%/ui/shotwell.glade +%%DATADIR%%/ui/tags.ui +%%DATADIR%%/ui/trash.ui +@dirrm %%DATADIR%%/ui +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast +@dirrmtry share/applications @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true |