4 files changed, 47 insertions, 15 deletions

diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index b07355b8bce2..c3fc64f7c9ca 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gogglesmm
-PORTVERSION=	0.12.1
-PORTREVISION=	2
+PORTVERSION=	0.12.2
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
@@ -42,12 +41,12 @@ PORTDOCS=	README AUTHORS
 
 .include <bsd.port.options.mk>
 .if (defined(WITHOUT_FOX16) && defined(WITHOUT_FOX17)) || (defined(WITH_FOX16) && defined(WITH_FOX17))
-IGNORE=	You should choose between FOX16 and FOX17
+IGNORE=	you should choose between FOX16 and FOX17
 .endif
 
 .if defined(WITH_FOX16)
 LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
-.endif 
+.endif
 
 .if defined(WITH_FOX17)
 LIB_DEPENDS+=	FOX-1.7:${PORTSDIR}/x11-toolkits/fox17
@@ -84,6 +83,9 @@ USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--without-new-remote
 .endif
 
+pre-install:
+	@${MKDIR} ${PREFIX}/share/applications
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo
index 94ac7f8f8bb8..8f1daf6a7af0 100644
--- a/audio/gogglesmm/distinfo
+++ b/audio/gogglesmm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gogglesmm-0.12.1.tar.xz) = 021d6a935c5a91fed3bea44cafd206a20d93be6e40045f81e1d2f5a4eb2c2c21
-SIZE (gogglesmm-0.12.1.tar.xz) = 319696
+SHA256 (gogglesmm-0.12.2.tar.xz) = ab6689369e4ef76c3ac1aae4116f06625934a4767d32f610a331fa5ee1f3c0a7
+SIZE (gogglesmm-0.12.2.tar.xz) = 334968
diff --git a/audio/gogglesmm/files/patch-Makefile b/audio/gogglesmm/files/patch-Makefile
index 1714b800e54b..ba925d63278e 100644
--- a/audio/gogglesmm/files/patch-Makefile
+++ b/audio/gogglesmm/files/patch-Makefile
@@ -1,19 +1,34 @@
---- ./Makefile.orig	2010-11-09 17:21:47.000000000 +0100
-+++ ./Makefile	2010-11-17 11:43:24.638891288 +0100
-@@ -153,19 +153,22 @@
+--- Makefile.orig	2011-06-08 22:00:13.000000000 +0200
++++ Makefile	2011-07-10 23:08:16.155548542 +0200
+@@ -149,24 +149,32 @@
  #----------------------------------------------------------
  install: $(BINNAME)
  	@echo "    Installing $(INSTALL_DIR)/bin/gogglesmm ..."
 -	@$(INSTALL) -m 755 -D src/gogglesmm $(INSTALL_DIR)/bin/gogglesmm
 +	@$(INSTALL) -m 755 src/gogglesmm $(INSTALL_DIR)/bin/gogglesmm
++	mkdir -p $(INSTALL_DIR)/share/applications
  	@echo "    Installing $(INSTALL_DIR)/share/applications/gogglesmm.desktop"
 -	@$(INSTALL) -m 644 -D extra/gogglesmm.desktop $(INSTALL_DIR)/share/applications/gogglesmm.desktop
-+	@mkdir -p $(INSTALL_DIR)/share/applications/
 +	@$(INSTALL) -m 644 extra/gogglesmm.desktop $(INSTALL_DIR)/share/applications/gogglesmm.desktop
- 	@echo "    Installing $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png"
--	@$(INSTALL) -m 644 -D extra/gogglesmm.png $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png
-+	@mkdir -p $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/
-+	@$(INSTALL) -m 644 extra/gogglesmm.png $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png
+ 	@echo "    Installing Icons"
+-	$(INSTALL) -m 644 -D icons/gogglesmm_16.png $(INSTALL_DIR)/share/icons/hicolor/16x16/apps/gogglesmm.png
+-	$(INSTALL) -m 644 -D extra/gogglesmm_22.png $(INSTALL_DIR)/share/icons/hicolor/22x22/apps/gogglesmm.png
+-	$(INSTALL) -m 644 -D extra/gogglesmm_24.png $(INSTALL_DIR)/share/icons/hicolor/24x24/apps/gogglesmm.png
+-	$(INSTALL) -m 644 -D icons/gogglesmm_32.png $(INSTALL_DIR)/share/icons/hicolor/32x32/apps/gogglesmm.png
+-	$(INSTALL) -m 644 -D extra/gogglesmm_48.png $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png
+-	$(INSTALL) -m 644 -D extra/gogglesmm.svg $(INSTALL_DIR)/share/icons/hicolor/scalable/apps/gogglesmm.svg
++	mkdir -p $(INSTALL_DIR)/share/icons/hicolor/16x16/apps/
++	$(INSTALL) -m 644 icons/gogglesmm_16.png $(INSTALL_DIR)/share/icons/hicolor/16x16/apps/gogglesmm.png
++	mkdir -p $(INSTALL_DIR)/share/icons/hicolor/22x22/apps/
++	$(INSTALL) -m 644 extra/gogglesmm_22.png $(INSTALL_DIR)/share/icons/hicolor/22x22/apps/gogglesmm.png
++	mkdir -p $(INSTALL_DIR)/share/icons/hicolor/24x24/apps/
++	$(INSTALL) -m 644 extra/gogglesmm_24.png $(INSTALL_DIR)/share/icons/hicolor/24x24/apps/gogglesmm.png
++	mkdir -p $(INSTALL_DIR)/share/icons/hicolor/32x32/apps/
++	$(INSTALL) -m 644 icons/gogglesmm_32.png $(INSTALL_DIR)/share/icons/hicolor/32x32/apps/gogglesmm.png
++	mkdir -p $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/
++	$(INSTALL) -m 644 extra/gogglesmm_48.png $(INSTALL_DIR)/share/icons/hicolor/48x48/apps/gogglesmm.png
++	mkdir -p $(INSTALL_DIR)/share/icons/hicolor/scalable/apps/
++	$(INSTALL) -m 644 extra/gogglesmm.svg $(INSTALL_DIR)/share/icons/hicolor/scalable/apps/gogglesmm.svg
  	@echo "    Installing $(INSTALL_MANDIR)/man1/gogglesmm.1"
 -	@$(INSTALL) -m 644 -D extra/gogglesmm.1 $(INSTALL_MANDIR)/man1/gogglesmm.1
 +	@$(INSTALL) -m 644 extra/gogglesmm.1 $(INSTALL_MANDIR)/man1/gogglesmm.1
@@ -23,7 +38,7 @@
  	for tr in $$linguas ; do \
      echo "    Installing $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo" ;\
 -  	$(INSTALL) -m 644 -D po/$$tr.mo -T $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo ; \
-+    	mkdir -p $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/; \
++        mkdir -p $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/ ; \
 +  	$(INSTALL) -m 644 po/$$tr.mo $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo ; \
  	done;
  endif
diff --git a/audio/gogglesmm/pkg-plist b/audio/gogglesmm/pkg-plist
index 94f1be145b1d..3e1f51877351 100644
--- a/audio/gogglesmm/pkg-plist
+++ b/audio/gogglesmm/pkg-plist
@@ -1,6 +1,11 @@
 bin/gogglesmm
 share/applications/gogglesmm.desktop
+share/icons/hicolor/16x16/apps/gogglesmm.png
+share/icons/hicolor/22x22/apps/gogglesmm.png
+share/icons/hicolor/24x24/apps/gogglesmm.png
+share/icons/hicolor/32x32/apps/gogglesmm.png
 share/icons/hicolor/48x48/apps/gogglesmm.png
+share/icons/hicolor/scalable/apps/gogglesmm.svg
 %%NLS%%share/locale/de/LC_MESSAGES/gogglesmm.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gogglesmm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gogglesmm.mo
@@ -8,7 +13,17 @@ share/icons/hicolor/48x48/apps/gogglesmm.png
 %%NLS%%share/locale/hu/LC_MESSAGES/gogglesmm.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gogglesmm.mo
 @dirrmtry share/applications
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons