4 files changed, 27 insertions, 103 deletions

diff --git a/audio/gmtp/Makefile b/audio/gmtp/Makefile
index f7934d128bd9..2e23f7a17d06 100644
--- a/audio/gmtp/Makefile
+++ b/audio/gmtp/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	gmtp
-PORTVERSION=	1.3.4
-PORTREVISION=	4
+PORTVERSION=	1.3.8
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/gMTP-${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-i386
 
 MAINTAINER=	freebsd-ports-local@be-well.ilk.org
 COMMENT=	Media Transfer Protocol (MTP) GUI client
@@ -17,36 +15,39 @@ LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-WRKSRC=		${WRKDIR}/gMTP
-
+GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		gettext gmake pkgconfig
+USES=		gmake pkgconfig
 USE_GNOME=	glib20
 
-PORTDOCS=	*
+PORTDOCS=	AUTHORS COPYING ChangeLog README
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_RADIO=	GTK
 OPTIONS_RADIO_GTK=	GTK2 GTK3
 OPTIONS_DEFAULT=	GTK2
+OPTIONS_SUB=		yes
+
+GTK3_USE=		GNOME=gtk30
+GTK3_CONFIGURE_WITH=	gtk3
+GTK2_USE=		GNOME=gtk20,gconf2
+GTK2_CONFIGURE_WITH=	gtk2
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20 gconf2
 GCONF_SCHEMAS=	gmtp.schemas
-ALL_TARGET=	gtk2
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
 GLIB_SCHEMAS=	org.gnome.gmtp.gschema.xml
-ALL_TARGET=	gtk3
-INSTALL_TARGET=	install-gtk3
 .endif
 
 post-install:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-doc)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/gmtp/distinfo b/audio/gmtp/distinfo
index 54b07293e4e9..f9cb9f223837 100644
--- a/audio/gmtp/distinfo
+++ b/audio/gmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gmtp-1.3.4-i386.tar.gz) = 9bf99c517bb40b8df288243e2b77aebb2c3d62b2baf98f9aa8675d6cf910be41
-SIZE (gmtp-1.3.4-i386.tar.gz) = 878661
+SHA256 (gmtp-1.3.8.tar.gz) = edb9aa6f2421be3090fa53c5384fdf0dfb43cafcf6c1c3621ab5eeb889ebb580
+SIZE (gmtp-1.3.8.tar.gz) = 479173
diff --git a/audio/gmtp/files/patch-Makefile b/audio/gmtp/files/patch-Makefile
deleted file mode 100644
index 530365508f3e..000000000000
--- a/audio/gmtp/files/patch-Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
---- Makefile.orig	2012-08-06 13:24:43.000000000 +0200
-+++ Makefile	2013-12-05 14:23:50.881516874 +0100
-@@ -27,7 +27,7 @@
- LDFLAGS += -L/usr/sfw/lib -R/usr/sfw/lib
- endif
- else
--CC = gcc
-+CC ?= gcc
- CFLAGS += -std=c99 -Wall
- INSTALL = install -c
- MSGFMT = msgfmt
-@@ -126,8 +126,8 @@
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/applications
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/pixmaps
--	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/gconf
--	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/gconf/schemas
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/gconf
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/gconf/schemas
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale/es
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale/it
-@@ -154,18 +154,16 @@
- 	$(INSTALL) -m 644 images/empty.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 images/view-refresh.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 misc/gMTP.desktop $(DESTDIR)$(PREFIX)/share/applications
--	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps
--	$(INSTALL) -m 644 misc/gMTP.schemas $(DESTDIR)$(PREFIX)/share/gconf/schemas
--	mv $(DESTDIR)$(PREFIX)/share/pixmaps/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
-+	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
-+	$(INSTALL) -m 644 misc/gMTP.schemas $(DESTDIR)$(PREFIX)/etc/gconf/schemas/gmtp.schemas
- 	cp po/es.mo $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
- 	cp po/fr.mo $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
- 	cp po/it.mo $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES/gmtp.mo
- 	cp po/da.mo $(DESTDIR)$(PREFIX)/share/locale/da/LC_MESSAGES/gmtp.mo
- 	cp po/de.mo $(DESTDIR)$(PREFIX)/share/locale/de/LC_MESSAGES/gmtp.mo
--	mv $(DESTDIR)$(PREFIX)/share/gconf/schemas/gMTP.schemas $(DESTDIR)$(PREFIX)/share/gconf/schemas/gmtp.schemas
- 
- register-gconf-schemas: install
--	GCONF_CONFIG_SOURCE=`$(GCONFTOOL) --get-default-source` $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(PREFIX)/share/gconf/schemas/gmtp.schemas
-+	GCONF_CONFIG_SOURCE=`$(GCONFTOOL) --get-default-source` $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(PREFIX)/etc/gconf/schemas/gmtp.schemas
- 
- install-gtk3: gmtp $(catalogues)
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)
-@@ -193,7 +191,7 @@
- 	$(INSTALL) -m 644 images/logo.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 images/stock-about-16.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 misc/gMTP.desktop $(DESTDIR)$(PREFIX)/share/applications
--	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps
-+	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
- 	$(INSTALL) -m 644 images/audio-x-mp3-playlist.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 images/audio-x-mpeg.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 images/folder.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
-@@ -203,7 +201,7 @@
- 	$(INSTALL) -m 644 images/video-x-generic.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 images/empty.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
- 	$(INSTALL) -m 644 images/view-refresh.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
--	mv $(DESTDIR)$(PREFIX)/share/pixmaps/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
-+	$(INSTALL) -m 644 misc/org.gnome.gmtp.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- 	cp po/es.mo $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
- 	cp po/fr.mo $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
- 	cp po/it.mo $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES/gmtp.mo
-@@ -211,7 +209,6 @@
- 	cp po/de.mo $(DESTDIR)$(PREFIX)/share/locale/de/LC_MESSAGES/gmtp.mo
- 
- register-gsettings-schemas: install-gtk3
--	$(INSTALL) -m 644 misc/org.gnome.gmtp.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- 
- install-doc:
-@@ -227,7 +224,7 @@
- 	rm -f  $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)/*
- 	rm -f  $(DESTDIR)$(PREFIX)/share/applications/gMTP.desktop
- 	rm -f  $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
--	rm -f  $(DESTDIR)$(PREFIX)/share/gconf/schemas/gmtp.schemas
-+	rm -f  $(DESTDIR)$(PREFIX)/share/etc/schemas/gmtp.schemas
- 	rm -f  $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.gnome.gMTP.gschema.xml
- 	rm -f  $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
- 	rm -f  $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
diff --git a/audio/gmtp/pkg-plist b/audio/gmtp/pkg-plist
index fbcd4054a930..135cada995de 100644
--- a/audio/gmtp/pkg-plist
+++ b/audio/gmtp/pkg-plist
@@ -1,10 +1,11 @@
 bin/gmtp
+share/applications/gmtp.desktop
 %%DATADIR%%/audio-x-mp3-playlist.png
 %%DATADIR%%/audio-x-mpeg.png
 %%DATADIR%%/empty.png
 %%DATADIR%%/folder.png
+%%DATADIR%%/gmtpicon.png
 %%DATADIR%%/icon-16.png
-%%DATADIR%%/icon.png
 %%DATADIR%%/image-x-generic.png
 %%DATADIR%%/logo.png
 %%DATADIR%%/media-cdrom-audio.png
@@ -12,10 +13,11 @@ bin/gmtp
 %%DATADIR%%/text-plain.png
 %%DATADIR%%/video-x-generic.png
 %%DATADIR%%/view-refresh.png
-share/applications/gMTP.desktop
-share/locale/da/LC_MESSAGES/gmtp.mo
-share/locale/de/LC_MESSAGES/gmtp.mo
-share/locale/es/LC_MESSAGES/gmtp.mo
-share/locale/fr/LC_MESSAGES/gmtp.mo
-share/locale/it/LC_MESSAGES/gmtp.mo
-share/pixmaps/gMTPicon.png
+%%NLS%%share/locale/da/LC_MESSAGES/gmtp.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gmtp.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/gmtp.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gmtp.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gmtp.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gmtp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gmtp.mo
+share/pixmaps/gmtpicon.png