- Update to 3.1

- Adjust LICENSE and MASTER_SITES

Replace 'x11-themes/gnome-icons/bsd.gnome-icons.mk' by it's equivalent,
otherwise icons are located into 'share/icons/elementaryicons3.1/' directory

PR:		200081
Submitted by:	myself
Approved by:	Nicole Reid (maintainer)

3 files changed, 50 insertions, 12 deletions

diff --git a/x11-themes/gnome-icons-elementary/Makefile b/x11-themes/gnome-icons-elementary/Makefile
index f9a9d6a1b2d8..b456558fd856 100644
--- a/x11-themes/gnome-icons-elementary/Makefile
+++ b/x11-themes/gnome-icons-elementary/Makefile
@@ -2,17 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	elementary
-PORTVERSION=	3.0
+PORTVERSION=	3.1
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	https://cooltrainer.org/freebsd-ports/gnome-icons-elementary/
+MASTER_SITES=	https://launchpadlibrarian.net/147829592/ \
+	https://launchpad.net/elementaryicons/3.x/${PORTVERSION}/+download/
+PKGNAMEPREFIX=	gnome-icons-
+DISTNAME=	${PORTNAME}icons${PORTVERSION}
 
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Elementary icon set
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
-USES=	zip:infozip
-EXTRACT_AFTER_ARGS?=	-d ${WRKDIR} -x 'elementary/.bzrignore'
+NO_BUILD=	yes
+INSTALLS_ICONS=	yes
+
+pre-install:
+	cd ${WRKSRC} && ${FIND} * -type d ! -empty \
+		! -path 'stage*' \
+		-exec ${MKDIR} -m 0755 \
+		${STAGEDIR}${PREFIX}/share/icons/elementary/"{}" \;
+
+do-install:
+	cd ${WRKSRC} && ${FIND} * ! -type d ! -name 'plist' ! -name '*.bak' \
+		! -name '${LICENSE}' \
+		! -path 'stage/*' \
+		-exec ${INSTALL_DATA} ${WRKSRC}/"{}" \
+		${STAGEDIR}${PREFIX}/share/icons/elementary/"{}" \;
 
-.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-elementary/distinfo b/x11-themes/gnome-icons-elementary/distinfo
index f8ecb547639d..35c526118952 100644
--- a/x11-themes/gnome-icons-elementary/distinfo
+++ b/x11-themes/gnome-icons-elementary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elementary-3.0.zip) = 5b9eed67c769cf58610cdb67c006299af7d3d2923d2ae9ac93957d6f99067dd2
-SIZE (elementary-3.0.zip) = 5785793
+SHA256 (elementaryicons3.1.tar.gz) = 9a3f2c8e5067c64992f2efcddd13b5665e30143729e26ab89da73ab3211220de
+SIZE (elementaryicons3.1.tar.gz) = 2937506
diff --git a/x11-themes/gnome-icons-elementary/pkg-plist b/x11-themes/gnome-icons-elementary/pkg-plist
index 794e55087a11..a4a8a75aaa16 100644
--- a/x11-themes/gnome-icons-elementary/pkg-plist
+++ b/x11-themes/gnome-icons-elementary/pkg-plist
@@ -252,9 +252,12 @@ share/icons/elementary/actions/22/mail-reply-all.svg
 share/icons/elementary/actions/22/mail-reply-sender.svg
 share/icons/elementary/actions/22/media-eject.svg
 share/icons/elementary/actions/22/media-import-audio-cd.svg
+share/icons/elementary/actions/22/media-playback-pause.svg
 share/icons/elementary/actions/22/media-playback-start.svg
 share/icons/elementary/actions/22/media-playback-stop.svg
 share/icons/elementary/actions/22/media-record.svg
+share/icons/elementary/actions/22/media-skip-backward.svg
+share/icons/elementary/actions/22/media-skip-forward.svg
 share/icons/elementary/actions/22/node-add.svg
 share/icons/elementary/actions/22/node-align-horizontal.svg
 share/icons/elementary/actions/22/node-align-vertical.svg
@@ -953,7 +956,6 @@ share/icons/elementary/categories/16/preferences-desktop-accessibility.svg
 share/icons/elementary/categories/16/preferences-desktop-effects.svg
 share/icons/elementary/categories/16/preferences-desktop-locale.svg
 share/icons/elementary/categories/16/preferences-desktop-sound.svg
-share/icons/elementary/categories/16/preferences-system-network.svg
 share/icons/elementary/categories/16/preferences-system-time.svg
 share/icons/elementary/categories/22/config-language.svg
 share/icons/elementary/categories/22/ppa.svg
@@ -1047,12 +1049,11 @@ share/icons/elementary/categories/48/preferences-desktop-privacy.svg
 share/icons/elementary/categories/48/preferences-desktop-sound.svg
 share/icons/elementary/categories/48/preferences-desktop.svg
 share/icons/elementary/categories/48/preferences-system-network.svg
-share/icons/elementary/categories/48/preferences-system-power.svg
 share/icons/elementary/categories/48/preferences-system-time.svg
 share/icons/elementary/categories/48/system-help.svg
 share/icons/elementary/categories/64/ppa.svg
 share/icons/elementary/categories/64/preferences-desktop-accessibility.svg
-share/icons/elementary/categories/64/preferences-system-network.svg
+share/icons/elementary/categories/64/preferences-desktop-sound.svg
 share/icons/elementary/devices/128/display.svg
 share/icons/elementary/devices/128/drive-cdrom.svg
 share/icons/elementary/devices/128/drive-harddisk.svg
@@ -1244,6 +1245,9 @@ share/icons/elementary/devices/64/video-display.svg
 share/icons/elementary/devices/symbolic/camera-photo-symbolic.svg
 share/icons/elementary/devices/symbolic/camera-video-symbolic.svg
 share/icons/elementary/devices/symbolic/drive-harddisk-symbolic.svg
+share/icons/elementary/devices/symbolic/media-optical-symbolic.svg
+share/icons/elementary/devices/symbolic/media-removable-symbolic.svg
+share/icons/elementary/devices/symbolic/multimedia-player-symbolic.svg
 share/icons/elementary/devices/symbolic/phone-symbolic.svg
 share/icons/elementary/devices/symbolic/printer-symbolic.svg
 share/icons/elementary/emblems/24/emblem-symbolic-link.svg
@@ -2004,6 +2008,7 @@ share/icons/elementary/places/symbolic/folder-recent-symbolic.svg
 share/icons/elementary/places/symbolic/folder-remote-symbolic.svg
 share/icons/elementary/places/symbolic/folder-symbolic.svg
 share/icons/elementary/places/symbolic/folder-videos-symbolic.svg
+share/icons/elementary/places/symbolic/user-home-symbolic.svg
 share/icons/elementary/places/symbolic/user-trash-symbolic.svg
 share/icons/elementary/status/128/aptdaemon-add.svg
 share/icons/elementary/status/128/dialog-error.svg
@@ -2032,14 +2037,17 @@ share/icons/elementary/status/16/battery-empty.svg
 share/icons/elementary/status/16/battery-full-charging.svg
 share/icons/elementary/status/16/dialog-error.svg
 share/icons/elementary/status/16/dialog-information.svg
+share/icons/elementary/status/16/dialog-password.svg
 share/icons/elementary/status/16/dialog-question.svg
 share/icons/elementary/status/16/image-missing.svg
 share/icons/elementary/status/16/locked.svg
 share/icons/elementary/status/16/mail-forwarded.svg
 share/icons/elementary/status/16/mail-replied.svg
 share/icons/elementary/status/16/mail-unread.svg
+share/icons/elementary/status/16/network-wireless-encrypted.svg
 share/icons/elementary/status/16/non-starred-grey.svg
 share/icons/elementary/status/16/non-starred.svg
+share/icons/elementary/status/16/security-medium.svg
 share/icons/elementary/status/16/starred.svg
 share/icons/elementary/status/16/user-available.svg
 share/icons/elementary/status/16/user-away.svg
@@ -2131,7 +2139,6 @@ share/icons/elementary/status/48/aptdaemon-setup.svg
 share/icons/elementary/status/48/aptdaemon-update-cache.svg
 share/icons/elementary/status/48/aptdaemon-upgrade.svg
 share/icons/elementary/status/48/aptdaemon-working.svg
-share/icons/elementary/status/48/batery-phone-000.svg
 share/icons/elementary/status/48/battery-ac-adapter.svg
 share/icons/elementary/status/48/battery-caution-charging.svg
 share/icons/elementary/status/48/battery-caution.svg
@@ -2149,6 +2156,7 @@ share/icons/elementary/status/48/battery-mouse-040.svg
 share/icons/elementary/status/48/battery-mouse-060.svg
 share/icons/elementary/status/48/battery-mouse-080.svg
 share/icons/elementary/status/48/battery-mouse-100.svg
+share/icons/elementary/status/48/battery-phone-000.svg
 share/icons/elementary/status/48/battery-phone-020.svg
 share/icons/elementary/status/48/battery-phone-040.svg
 share/icons/elementary/status/48/battery-phone-060.svg
@@ -2162,6 +2170,8 @@ share/icons/elementary/status/48/dialog-warning.svg
 share/icons/elementary/status/48/image-loading.svg
 share/icons/elementary/status/48/image-missing.svg
 share/icons/elementary/status/48/locked.svg
+share/icons/elementary/status/48/network-error.svg
+share/icons/elementary/status/48/network-idle.svg
 share/icons/elementary/status/48/network-wireless-encrypted.svg
 share/icons/elementary/status/48/printer-error.svg
 share/icons/elementary/status/48/printer-printing.svg
@@ -2173,11 +2183,24 @@ share/icons/elementary/status/64/dialog-question.svg
 share/icons/elementary/status/64/dialog-warning.svg
 share/icons/elementary/status/64/image-loading.svg
 share/icons/elementary/status/64/image-missing.svg
+share/icons/elementary/status/64/network-error.svg
 share/icons/elementary/status/symbolic/audio-volume-high-symbolic.svg
 share/icons/elementary/status/symbolic/audio-volume-low-symbolic.svg
 share/icons/elementary/status/symbolic/audio-volume-medium-symbolic.svg
 share/icons/elementary/status/symbolic/audio-volume-muted-symbolic.svg
 share/icons/elementary/status/symbolic/avatar-default-symbolic.svg
+share/icons/elementary/status/symbolic/battery-caution-charging-symbolic.svg
+share/icons/elementary/status/symbolic/battery-caution-symbolic.svg
+share/icons/elementary/status/symbolic/battery-empty-charging-symbolic.svg
+share/icons/elementary/status/symbolic/battery-empty-symbolic.svg
+share/icons/elementary/status/symbolic/battery-full-charged-symbolic.svg
+share/icons/elementary/status/symbolic/battery-full-charging-symbolic.svg
+share/icons/elementary/status/symbolic/battery-full-symbolic.svg
+share/icons/elementary/status/symbolic/battery-good-charging-symbolic.svg
+share/icons/elementary/status/symbolic/battery-good-symbolic.svg
+share/icons/elementary/status/symbolic/battery-low-charging-symbolic.svg
+share/icons/elementary/status/symbolic/battery-low-symbolic.svg
+share/icons/elementary/status/symbolic/battery-missing-symbolic.svg
 share/icons/elementary/status/symbolic/bluetooth-active-symbolic.svg
 share/icons/elementary/status/symbolic/bluetooth-disabled-symbolic.svg
 share/icons/elementary/status/symbolic/brightness-display-symbolic.svg