From 16929fa183c6654722b249c7b25ab4d44c36d1b1 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 13 May 2008 15:55:19 +0000
Subject: Don't install copies of GD files they get picked up before the port
 version and the port version has now been updates.

Reported by:	Christopher Key <cjk32 at cam dot ac dot uk>
---
 audio/squeezeboxserver/Makefile  | 4 +++-
 audio/squeezeboxserver/pkg-plist | 6 ------
 audio/squeezecenter/Makefile     | 4 +++-
 audio/squeezecenter/pkg-plist    | 6 ------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 43ab6b3827ad..704221237004 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squeezecenter
 PORTVERSION=	7.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SqueezeCenter_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-7.0-noCPAN
@@ -93,6 +93,7 @@ DOCFILES=	Changelog.html Installation.txt License.txt
 CONFFILES=	convert.conf types.conf
 EXCEPTFILES=	${DOCFILES} \
 		${CONFFILES} \
+		CPAN/GD.pm \
 		CPAN/Template.pm \
 		CPAN/XML/Parser.pm \
 		MySQL/errmsg.txt \
@@ -101,6 +102,7 @@ EXCEPTDIRS=	Bin \
 		CPAN/arch \
 		CPAN/Compress \
 		CPAN/JSON \
+		CPAN/GD \
 		CPAN/Template \
 		CPAN/XML/Parser \
 		CPAN/YAML
diff --git a/audio/squeezeboxserver/pkg-plist b/audio/squeezeboxserver/pkg-plist
index e016ccccdc4a..86eebab508dc 100644
--- a/audio/squeezeboxserver/pkg-plist
+++ b/audio/squeezeboxserver/pkg-plist
@@ -163,11 +163,6 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/File/Tail.pm
 %%SLIMDIR%%/CPAN/File/Temp.pm
 %%SLIMDIR%%/CPAN/File/Which.pm
-%%SLIMDIR%%/CPAN/GD.pm
-%%SLIMDIR%%/CPAN/GD/Image.pm
-%%SLIMDIR%%/CPAN/GD/Polygon.pm
-%%SLIMDIR%%/CPAN/GD/Polyline.pm
-%%SLIMDIR%%/CPAN/GD/Simple.pm
 %%SLIMDIR%%/CPAN/HTML/Entities.pm
 %%SLIMDIR%%/CPAN/HTML/Filter.pm
 %%SLIMDIR%%/CPAN/HTML/Form.pm
@@ -2493,7 +2488,6 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/CPAN/HTTP/Cookies
 @dirrm %%SLIMDIR%%/CPAN/HTTP
 @dirrm %%SLIMDIR%%/CPAN/HTML
-@dirrm %%SLIMDIR%%/CPAN/GD
 @dirrm %%SLIMDIR%%/CPAN/File/Spec
 @dirrm %%SLIMDIR%%/CPAN/File/Find
 @dirrm %%SLIMDIR%%/CPAN/File
diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile
index 43ab6b3827ad..704221237004 100644
--- a/audio/squeezecenter/Makefile
+++ b/audio/squeezecenter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squeezecenter
 PORTVERSION=	7.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.slimdevices.com/downloads/SqueezeCenter_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-7.0-noCPAN
@@ -93,6 +93,7 @@ DOCFILES=	Changelog.html Installation.txt License.txt
 CONFFILES=	convert.conf types.conf
 EXCEPTFILES=	${DOCFILES} \
 		${CONFFILES} \
+		CPAN/GD.pm \
 		CPAN/Template.pm \
 		CPAN/XML/Parser.pm \
 		MySQL/errmsg.txt \
@@ -101,6 +102,7 @@ EXCEPTDIRS=	Bin \
 		CPAN/arch \
 		CPAN/Compress \
 		CPAN/JSON \
+		CPAN/GD \
 		CPAN/Template \
 		CPAN/XML/Parser \
 		CPAN/YAML
diff --git a/audio/squeezecenter/pkg-plist b/audio/squeezecenter/pkg-plist
index e016ccccdc4a..86eebab508dc 100644
--- a/audio/squeezecenter/pkg-plist
+++ b/audio/squeezecenter/pkg-plist
@@ -163,11 +163,6 @@ bin/softsqueeze
 %%SLIMDIR%%/CPAN/File/Tail.pm
 %%SLIMDIR%%/CPAN/File/Temp.pm
 %%SLIMDIR%%/CPAN/File/Which.pm
-%%SLIMDIR%%/CPAN/GD.pm
-%%SLIMDIR%%/CPAN/GD/Image.pm
-%%SLIMDIR%%/CPAN/GD/Polygon.pm
-%%SLIMDIR%%/CPAN/GD/Polyline.pm
-%%SLIMDIR%%/CPAN/GD/Simple.pm
 %%SLIMDIR%%/CPAN/HTML/Entities.pm
 %%SLIMDIR%%/CPAN/HTML/Filter.pm
 %%SLIMDIR%%/CPAN/HTML/Form.pm
@@ -2493,7 +2488,6 @@ squeezecenter/MySQL/errmsg.sys
 @dirrm %%SLIMDIR%%/CPAN/HTTP/Cookies
 @dirrm %%SLIMDIR%%/CPAN/HTTP
 @dirrm %%SLIMDIR%%/CPAN/HTML
-@dirrm %%SLIMDIR%%/CPAN/GD
 @dirrm %%SLIMDIR%%/CPAN/File/Spec
 @dirrm %%SLIMDIR%%/CPAN/File/Find
 @dirrm %%SLIMDIR%%/CPAN/File
-- 
cgit v1.2.3