sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug in Makefile that installs stuff in /usr/share. Unbreak.

Browse source 
Submitted by:	pointy
Feature safe:	yes
This commit is contained in:
David Thiel 2012-03-07 20:41:35 +00:00
parent 7d79668b57
commit aa48b30d99
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292912
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/shotwell/Makefile
View file

@ -26,8 +26,6 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
raw.5:${PORTSDIR}/graphics/libraw raw.5:${PORTSDIR}/graphics/libraw
BROKEN= installs file under /usr/share
USE_BZIP2= yes USE_BZIP2= yes
USE_GETTEXT= yes USE_GETTEXT= yes
USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2 USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2

13
graphics/shotwell/files/patch-Makefile
View file

@ -1,5 +1,5 @@
--- Makefile.orig 2011-11-03 14:39:05.000000000 -0700 --- 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 @@ @@ -273,7 +273,6 @@
gstreamer-base-0.10 \ gstreamer-base-0.10 \
gstreamer-pbutils-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 ) @ ./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),\ $(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 ),) @ ./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 @@ @@ -660,7 +658,6 @@
# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY