- update to 0.11.5

- workaround a collision betwwen PACKAGES from ports framework dans PACKAGES in configure scripts
- workaround GNUism install install(1) usage

5 files changed, 84 insertions, 14 deletions

diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 908efcd59360..fd41dd1d794f 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gogglesmm
-PORTVERSION=	0.10.26
+PORTVERSION=	0.11.5
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Music collection manager and player
 
-LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine		\
-		tag.1:${PORTSDIR}/audio/taglib			\
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
+LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine \
+		tag.1:${PORTSDIR}/audio/taglib	\
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 OPTIONS=	DBUS "Add DBUS support" on \
@@ -22,9 +23,11 @@ OPTIONS=	DBUS "Add DBUS support" on \
 		NLS "Add support for nls" on \
 		NEWREMOTE "Use new remote player" on \
 		FOX16 "Use stable branch of  FOX" on \
-		FOX17 "Use development branch of FOX" off
+		FOX17 "Use development branch of FOX" off \
+		GCRYPT "Use libgcrypt for md5 calculation" off
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--mandir=${LOCALBASE}/man
 MAKE_JOBS_SAFE=	yes
 USE_GMAKE=	yes
 USE_XZ=		yes
@@ -35,8 +38,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTDOCS=	README AUTHORS
 
-CONFIGURE_ENV=	OPT_CFLAGS=" "
-
 .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
@@ -50,6 +51,13 @@ LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
 LIB_DEPENDS+=	FOX-1.7:${PORTSDIR}/x11-toolkits/fox17
 .endif
 
+.if defined(WITH_GCRYPT)
+LIB_DEPENDS+=	gcrypt.17:${PORTSDIR}/security/libgcrypt
+CONFIGURE_ARGS+=	--with-md5=gcrypt
+.else
+CONFIGURE_ARGS+=	--with-md5=internal
+.endif
+
 .if defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=	--without-dbus
 .else
@@ -74,10 +82,6 @@ USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--without-new-remote
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -i '' -e 's| -[DT] | |g' \
-		${WRKSRC}/Makefile
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo
index 57aa39edb0fd..3ef505a21650 100644
--- a/audio/gogglesmm/distinfo
+++ b/audio/gogglesmm/distinfo
@@ -1,3 +1,2 @@
-MD5 (gogglesmm-0.10.26.tar.xz) = 0af437902dcc0b1da49b3d48df930d8e
-SHA256 (gogglesmm-0.10.26.tar.xz) = 1200b4a9fdc507a94e4ffd19a821418f0ec1df300a0deaef292141824035c2c3
-SIZE (gogglesmm-0.10.26.tar.xz) = 361804
+SHA256 (gogglesmm-0.11.5.tar.xz) = e347279d2956c875e74ab2d19383461453c37d45d34cd0e983a0b38e32d1f5d4
+SIZE (gogglesmm-0.11.5.tar.xz) = 319324
diff --git a/audio/gogglesmm/files/patch-Makefile b/audio/gogglesmm/files/patch-Makefile
new file mode 100644
index 000000000000..1714b800e54b
--- /dev/null
+++ b/audio/gogglesmm/files/patch-Makefile
@@ -0,0 +1,30 @@
+--- ./Makefile.orig	2010-11-09 17:21:47.000000000 +0100
++++ ./Makefile	2010-11-17 11:43:24.638891288 +0100
+@@ -153,19 +153,22 @@
+ #----------------------------------------------------------
+ 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
+ 	@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 $(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
+ ifneq (,$(findstring nls,$(OPTIONS)))
+ 	@echo "    Installing Translations"
+ 	@linguas='$(filter $(TRANSLATIONS),$(LINGUAS))'; \
+ 	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/; \
++  	$(INSTALL) -m 644 po/$$tr.mo $(INSTALL_LOCALEDIR)/$$tr/LC_MESSAGES/gogglesmm.mo ; \
+ 	done;
+ endif
+ 
diff --git a/audio/gogglesmm/files/patch-build__functions b/audio/gogglesmm/files/patch-build__functions
new file mode 100644
index 000000000000..6154f10fdee8
--- /dev/null
+++ b/audio/gogglesmm/files/patch-build__functions
@@ -0,0 +1,20 @@
+--- ./build/functions.orig	2010-11-09 17:21:47.000000000 +0100
++++ ./build/functions	2010-11-17 11:42:12.745161258 +0100
+@@ -108,7 +108,7 @@
+   if [ "$?" -eq "0" ] ; then
+     exit -1
+   fi
+-  PACKAGES="$PACKAGES $1 "
++  GMMPKG="$GMMPKG $1 "
+   add_config "$2"
+   return 1
+ }
+@@ -119,7 +119,7 @@
+   if [ "$?" -eq "0" ] ; then
+     return 0
+   fi
+-  PACKAGES="$PACKAGES $1 "
++  GMMPKG="$GMMPKG $1 "
+   add_config "$2"
+   return 1
+ }
diff --git a/audio/gogglesmm/files/patch-configure b/audio/gogglesmm/files/patch-configure
new file mode 100644
index 000000000000..57e81d84bf40
--- /dev/null
+++ b/audio/gogglesmm/files/patch-configure
@@ -0,0 +1,17 @@
+--- ./configure.orig	2010-11-09 17:21:47.000000000 +0100
++++ ./configure	2010-11-17 11:42:22.565124308 +0100
+@@ -187,10 +187,10 @@
+ fi
+ 
+ 
+-PKG_LDFLAGS=$(pkg-config --libs-only-L $PACKAGES)
+-PKG_LIBS=$(pkg-config --libs-only-l --libs-only-other $PACKAGES)
+-PKG_CFLAGS=$(pkg-config --cflags-only-other $PACKAGES)
+-PKG_CPPFLAGS=$(pkg-config --cflags-only-I $PACKAGES)
++PKG_LDFLAGS=$(pkg-config --libs-only-L $GMMPKG)
++PKG_LIBS=$(pkg-config --libs-only-l --libs-only-other $GMMPKG)
++PKG_CFLAGS=$(pkg-config --cflags-only-other $GMMPKG)
++PKG_CPPFLAGS=$(pkg-config --cflags-only-I $GMMPKG)
+ 
+ if [ -n "$PKG_LDFLAGS"  ] ; then LIBS="$LIBS $PKG_LDFLAGS"; fi
+ if [ -n "$PKG_LIBS"     ] ; then LIBS="$LIBS $PKG_LIBS"; fi