Update MPDCon to the latest release. Switch upstream to GAP, which has

taken over maintaining it.

Approved by:	bapt (mentor)

4 files changed, 43 insertions, 17 deletions

diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index 461555c97376..70e0d459b37b 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -1,22 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	mpdcon
-PORTVERSION=	1.1.99
-PORTREVISION=	2
+PORTVERSION=	1.4
 CATEGORIES=	audio gnustep
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.2%20beta%201
-DISTNAME=	MPDCon-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	gap
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	MPD client for GNUstep
 
 LICENSE=	GPLv2
 
 USE_GNUSTEP=		yes
-NO_STAGE=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
+USE_GNUSTEP_LOCAL_LIBS+=	SQLClient:databases/sqlclient
+
+LIB_DEPENDS+=   libmpdclient.so.2:${PORTSDIR}/audio/libmpdclient
 
 post-patch:
 	${REINPLACE_CMD} -e \
diff --git a/audio/mpdcon/distinfo b/audio/mpdcon/distinfo
index ad7121a7bf5f..6df3bc761040 100644
--- a/audio/mpdcon/distinfo
+++ b/audio/mpdcon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MPDCon-1.1.99.tar.gz) = d4a4965d54bc03f238f54719afe055299f8283ef8882e19840ab7f735df670a2
-SIZE (MPDCon-1.1.99.tar.gz) = 71502
+SHA256 (MPDCon-1.4.tar.gz) = e2a4b1737c87aff7dc465b466fd988a5dae442efc9b1a53e1fada180f314be4c
+SIZE (MPDCon-1.4.tar.gz) = 87751
diff --git a/audio/mpdcon/files/patch-SQLiteAdaptor.m b/audio/mpdcon/files/patch-SQLiteAdaptor.m
new file mode 100644
index 000000000000..e4a099457b26
--- /dev/null
+++ b/audio/mpdcon/files/patch-SQLiteAdaptor.m
@@ -0,0 +1,12 @@
+--- ./SQLiteAdaptor.m.orig	2013-10-07 00:51:38.000000000 +0100
++++ ./SQLiteAdaptor.m	2013-10-07 00:51:54.000000000 +0100
+@@ -24,8 +24,8 @@
+ 
+ #import "SQLiteAdaptor.h"
+ 
+-@interface SQLiteAdaptor(Private)
+ static NSString* SongRatingStorageDirectory = nil;
++@interface SQLiteAdaptor(Private)
+ -(NSString *)_getMPDConDBName;
+ @end
+ 
diff --git a/audio/mpdcon/pkg-plist b/audio/mpdcon/pkg-plist
index fd29d18fc68c..c9d1c266e7c7 100644
--- a/audio/mpdcon/pkg-plist
+++ b/audio/mpdcon/pkg-plist
@@ -11,6 +11,9 @@ GNUstep/Local/Applications/MPDCon.app/Resources/Current.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/GNUstep.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/Info-gnustep.plist
 GNUstep/Local/Applications/MPDCon.app/Resources/Install
+GNUstep/Local/Applications/MPDCon.app/Resources/LyricsInspector.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/LyricsInspector.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/LyricsInspector.gorm/objects.gorm
 GNUstep/Local/Applications/MPDCon.app/Resources/MPDCon.desktop
 GNUstep/Local/Applications/MPDCon.app/Resources/MPDCon.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/MoveSong.tiff
@@ -31,6 +34,9 @@ GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/data.classes
 GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/data.info
 GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm/objects.gorm
 GNUstep/Local/Applications/MPDCon.app/Resources/Playlist.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistInspector.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistInspector.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistInspector.gorm/objects.gorm
 GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/Current.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/data.classes
 GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm/data.info
@@ -44,18 +50,25 @@ GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm/objects.gorm
 GNUstep/Local/Applications/MPDCon.app/Resources/Prev.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/Repeat.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/Shuffle.tiff
+GNUstep/Local/Applications/MPDCon.app/Resources/SongInspector.gorm/data.classes
+GNUstep/Local/Applications/MPDCon.app/Resources/SongInspector.gorm/data.info
+GNUstep/Local/Applications/MPDCon.app/Resources/SongInspector.gorm/objects.gorm
+GNUstep/Local/Applications/MPDCon.app/Resources/Star.tiff
 GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.classes
 GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/data.info
 GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm/objects.gorm
 GNUstep/Local/Applications/MPDCon.app/Resources/Stop.tiff
 GNUstep/Local/Applications/MPDCon.app/stamp.make
 GNUstep/Local/Tools/MPDCon
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources/Collection.gorm
-@dirrm GNUstep/Local/Applications/MPDCon.app/Resources
-@dirrm GNUstep/Local/Applications/MPDCon.app
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/StatisticsViewer.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/SongInspector.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/Preferences.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistsManager.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistViewer.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/PlaylistInspector.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/Player.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/LyricsInspector.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/CrossfadeView.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources/Collection.gorm
+@dirrmtry GNUstep/Local/Applications/MPDCon.app/Resources
+@dirrmtry GNUstep/Local/Applications/MPDCon.app