Update to 1.1.5, and add a missing dependency on hicolor-icon-theme.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1649 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 26 insertions, 9 deletions

diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index e95527c14..6d2f88c45 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome-icon-theme
-PORTVERSION=	1.1.4
+PORTVERSION=	1.1.5
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -15,12 +15,20 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of icons for the GNOME 2 desktop
 
+BUILD_DEPENDS=	${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS=	${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gnomehack intlhack gnometarget
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 76275a2e6..253ddac02 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-icon-theme-1.1.4.tar.bz2) = ea2327112f03372fdbc9521a4f641ffb
+MD5 (gnome2/gnome-icon-theme-1.1.5.tar.bz2) = 357695607adeefabf2b4079dcb5b1a62
diff --git a/misc/gnome-icon-theme/files/patch-Makefile.in b/misc/gnome-icon-theme/files/patch-Makefile.in
new file mode 100644
index 000000000..0868017d9
--- /dev/null
+++ b/misc/gnome-icon-theme/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Jan 13 16:03:30 2004
++++ Makefile.in	Tue Jan 13 16:03:57 2004
+@@ -119,6 +119,8 @@
+ hicolor_dirs = \
+ 	$(datadir)/pixmaps		\
+ 	$(datadir)/icons		\
++	%%X11BASE%%/share/icons		\
++	%%X11BASE%%/share/pixmaps	\
+ 	/usr/share/icons		\
+ 	/usr/share/pixmaps
+ 
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 0d2b601b3..8f01f5b4e 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -238,6 +238,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-ttf.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gameboy-rom.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-genesis-rom.png
+share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-glade.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnome-app-info.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnucash.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnumeric.png
@@ -546,6 +547,7 @@ share/icons/hicolor/16x16/stock/generic/stock_book_green.png
 share/icons/hicolor/16x16/stock/generic/stock_book_open.png
 share/icons/hicolor/16x16/stock/generic/stock_book_red.png
 share/icons/hicolor/16x16/stock/generic/stock_book_yellow.png
+share/icons/hicolor/16x16/stock/generic/stock_briefcase.png
 share/icons/hicolor/16x16/stock/generic/stock_calc-accept.png
 share/icons/hicolor/16x16/stock/generic/stock_calc-cancel.png
 share/icons/hicolor/16x16/stock/generic/stock_calendar.png
@@ -1335,6 +1337,7 @@ share/icons/hicolor/24x24/stock/generic/stock_book_green.png
 share/icons/hicolor/24x24/stock/generic/stock_book_open.png
 share/icons/hicolor/24x24/stock/generic/stock_book_red.png
 share/icons/hicolor/24x24/stock/generic/stock_book_yellow.png
+share/icons/hicolor/24x24/stock/generic/stock_briefcase.png
 share/icons/hicolor/24x24/stock/generic/stock_calc-accept.png
 share/icons/hicolor/24x24/stock/generic/stock_calc-cancel.png
 share/icons/hicolor/24x24/stock/generic/stock_calendar-view-day.png
@@ -1914,6 +1917,7 @@ share/icons/hicolor/32x32/stock/document/stock_new.png
 share/icons/hicolor/32x32/stock/document/stock_todo.png
 share/icons/hicolor/32x32/stock/generic/stock_alarm.png
 share/icons/hicolor/32x32/stock/generic/stock_autopilot.png
+share/icons/hicolor/32x32/stock/generic/stock_briefcase.png
 share/icons/hicolor/32x32/stock/generic/stock_calendar.png
 share/icons/hicolor/32x32/stock/generic/stock_cell-phone.png
 share/icons/hicolor/32x32/stock/generic/stock_dialog-info.png
@@ -2082,6 +2086,7 @@ share/icons/hicolor/48x48/stock/document/stock_new-text.png
 share/icons/hicolor/48x48/stock/document/stock_todo.png
 share/icons/hicolor/48x48/stock/generic/stock_alarm.png
 share/icons/hicolor/48x48/stock/generic/stock_autopilot.png
+share/icons/hicolor/48x48/stock/generic/stock_briefcase.png
 share/icons/hicolor/48x48/stock/generic/stock_calendar-and-tasks.png
 share/icons/hicolor/48x48/stock/generic/stock_calendar.png
 share/icons/hicolor/48x48/stock/generic/stock_cell-phone.png
@@ -2138,8 +2143,6 @@ share/icons/hicolor/48x48/stock/net/stock_spam.png
 share/icons/hicolor/72x72/apps/gnome-globe.png
 share/icons/hicolor/96x96/apps/gnome-globe.png
 share/icons/hicolor/96x96/apps/gnome-starthere.png
-@dirrm share/icons/hicolor/96x96/apps
-@dirrm share/icons/hicolor/96x96
 @dirrm share/icons/hicolor/72x72/apps
 @dirrm share/icons/hicolor/72x72
 @dirrm share/icons/hicolor/48x48/stock/net
@@ -2150,7 +2153,6 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png
 @dirrm share/icons/hicolor/48x48/stock/code
 @dirrm share/icons/hicolor/48x48/stock
 @dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/36x36/stock/generic
 @dirrm share/icons/hicolor/36x36/stock/document
 @dirrm share/icons/hicolor/36x36/stock
@@ -2167,7 +2169,6 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png
 @dirrm share/icons/hicolor/32x32/stock/chart
 @dirrm share/icons/hicolor/32x32/stock
 @dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/24x24/stock/text
 @dirrm share/icons/hicolor/24x24/stock/table
 @dirrm share/icons/hicolor/24x24/stock/object
@@ -2203,8 +2204,6 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png
 @dirrm share/icons/hicolor/16x16/stock/chart
 @dirrm share/icons/hicolor/16x16/stock
 @dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
 @dirrm share/icons/gnome/scalable/mimetypes
 @dirrm share/icons/gnome/scalable/filesystems
 @dirrm share/icons/gnome/scalable/emblems
@@ -2253,4 +2252,3 @@ share/icons/hicolor/96x96/apps/gnome-starthere.png
 @dirrm share/icons/gnome/12x12/devices
 @dirrm share/icons/gnome/12x12
 @dirrm share/icons/gnome
-@unexec /bin/rmdir %D/share/icons 2> /dev/null || /usr/bin/true