diff options
| author | lx <lx@FreeBSD.org> | 2012-03-08 04:41:35 +0800 |
|---|---|---|
| committer | lx <lx@FreeBSD.org> | 2012-03-08 04:41:35 +0800 |
| commit | ae83b8c383569b8a202279d510acd3564a32b96c (patch) | |
| tree | cc74c8b99953df328b4251083c5b19ac973a4c4b /graphics | |
| parent | 2c3d00a17dc2710c22097ba80a2ec449c3344d9d (diff) | |
| download | freebsd-ports-gnome-ae83b8c383569b8a202279d510acd3564a32b96c.tar.gz freebsd-ports-gnome-ae83b8c383569b8a202279d510acd3564a32b96c.tar.zst freebsd-ports-gnome-ae83b8c383569b8a202279d510acd3564a32b96c.zip | |
Fix bug in Makefile that installs stuff in /usr/share. Unbreak.
Submitted by: pointy
Feature safe: yes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/shotwell/Makefile | 2 | ||||
| -rw-r--r-- | graphics/shotwell/files/patch-Makefile | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index af7398f524fd..e4dd85d5158b 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -26,8 +26,6 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ raw.5:${PORTSDIR}/graphics/libraw -BROKEN= installs file under /usr/share - USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2 diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile index 234d5784ecc3..c11cbfa70b0c 100644 --- a/graphics/shotwell/files/patch-Makefile +++ b/graphics/shotwell/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig 2011-11-03 14:39:05.000000000 -0700 -+++ Makefile 2012-02-02 16:27:40.000000000 -0800 ++++ Makefile 2012-03-07 11:47:18.000000000 -0800 @@ -273,7 +273,6 @@ gstreamer-base-0.10 \ gstreamer-pbutils-0.10 \ @@ -25,6 +25,17 @@ @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ) $(if $(MAX_VALAC_VERSION),\ @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),) +@@ -556,8 +554,8 @@ + glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + endif + ifndef DISABLE_GSETTINGS_CONVERT_INSTALL +- mkdir -p $(DESTDIR)/usr/share/GConf/gsettings +- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings ++ mkdir -p $(DESTDIR)$(PREFIX)/share/GConf/gsettings ++ $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)$(PREFIX)/share/GConf/gsettings + endif + ifndef DISABLE_ICON_UPDATE + -gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || : @@ -660,7 +658,6 @@ # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY |