Update to version 0.2.1.

PR:		19674
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

7 files changed, 111 insertions, 17 deletions

diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 50d4190df17f..e3bf5dc57fd9 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -6,28 +6,28 @@
 #
 
 PORTNAME=	gdcd
-PORTVERSION=	0.0.2
+PORTVERSION=	0.2.1
 CATEGORIES=	audio
 MASTER_SITES=	http://cdcd.undergrid.net/gdcd/source_archive/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		cdaudio.1:${PORTSDIR}/audio/libcdaudio \
-		Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" GTK_CONFIG="${GTK_CONFIG}"
 
-# for libcdaudio
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+USE_X_PREFIX=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE=	automake -a -i
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GTK_CONFIG}" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-glibtest --disable-gtktest
 
-post-install:
-	@${ECHO}
-	@${ECHO} "Don't forget to make a symlink from your CDROM device to /dev/cdrom!"
-	@${ECHO}
+pre-configure:
+	@cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
 
 .include <bsd.port.mk>
diff --git a/audio/gdcd/distinfo b/audio/gdcd/distinfo
index ee0768be90ab..6cf73f149a0d 100644
--- a/audio/gdcd/distinfo
+++ b/audio/gdcd/distinfo
@@ -1,3 +1 @@
-$NetBSD: md5,v 1.1.1.1 1999/09/03 22:15:46 rh Exp $
-
-MD5 (gdcd-0.0.2.tar.gz) = 2c2fee796bd05fcdbacceab099826962
+MD5 (gdcd-0.2.1.tar.gz) = 86fa6ba50d90be6738c60fdf14032e65
diff --git a/audio/gdcd/files/patch-ae b/audio/gdcd/files/patch-ae
new file mode 100644
index 000000000000..b4ed42b9522f
--- /dev/null
+++ b/audio/gdcd/files/patch-ae
@@ -0,0 +1,35 @@
+--- configure.in.orig	Sat Jan  8 14:40:07 2000
++++ configure.in	Wed Jun 28 05:28:19 2000
+@@ -16,20 +16,12 @@
+ AC_PROG_MAKE_SET
+ AC_CANONICAL_HOST
+ 
+-AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread", AC_MSG_ERROR(Couldn't locate a POSIX threads library))
+-
+ CDAUDIO_LIBS="-lcdaudio"
+ 
+ AM_PATH_GLIB(1.2.0,,,)
+-AM_PATH_GTK(1.2.0)
+-
+-AC_PATH_PROG(GTK_CONFIG,gtk-config,no)
+-if test x$GTK_CONFIG != xno; then
+-        GTK_LIBS=`$GTK_CONFIG --libs`
+-        GTK_CFLAGS=`$GTK_CONFIG --cflags`
+-else
+-	AC_MSG_ERROR(Couldn't locate gtk-config)
+-fi
++AM_PATH_GTK(1.2.0,,
++	AC_MSG_ERROR(Couldn't locate gtk-config),
++	gthread)
+ 
+ AC_PATH_PROG(LIBART_CONFIG,libart-config,no)
+ if test x$LIBART_CONFIG != xno; then
+@@ -67,7 +59,7 @@
+ AC_SUBST(GDKPIXBUF_LIBS)
+ AC_SUBST(IMLIB_LIBS)
+ 
+-IMAGE_PATH='${prefix}/share/gdcd'
++IMAGE_PATH='${datadir}/pixmaps/gdcd'
+ AC_SUBST(IMAGE_PATH)
+ 
+ case "$host_os" in
diff --git a/audio/gdcd/files/patch-af b/audio/gdcd/files/patch-af
new file mode 100644
index 000000000000..0310b534f87c
--- /dev/null
+++ b/audio/gdcd/files/patch-af
@@ -0,0 +1,30 @@
+--- images/Makefile.am.orig	Fri Sep  3 09:26:05 1999
++++ images/Makefile.am	Thu Jun 29 01:36:05 2000
+@@ -3,15 +3,15 @@
+ EXTRA_DIST=blues.png data.png folk.png jazz.png misc.png newage.png nodisc.png reggae.png rock.png soundtrack.png unknown.png
+ 
+ install-data-am:
+-	$(mkinstalldirs) ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 blues.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 data.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 folk.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 jazz.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 misc.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 newage.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 nodisc.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 reggae.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 rock.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 soundtrack.png ${prefix}/share/gdcd
+-	$(INSTALL) -m 644 unknown.png ${prefix}/share/gdcd
++	$(mkinstalldirs) ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) blues.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) data.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) folk.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) jazz.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) misc.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) newage.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) nodisc.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) reggae.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) rock.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) soundtrack.png ${datadir}/pixmaps/gdcd
++	$(INSTALL_DATA) unknown.png ${datadir}/pixmaps/gdcd
diff --git a/audio/gdcd/files/patch-ag b/audio/gdcd/files/patch-ag
new file mode 100644
index 000000000000..9c7d3c13b95a
--- /dev/null
+++ b/audio/gdcd/files/patch-ag
@@ -0,0 +1,15 @@
+--- source/cddb.c.orig	Sat Jan  8 14:50:27 2000
++++ source/cddb.c	Thu Jun 29 01:11:30 2000
+@@ -200,7 +200,12 @@
+          return -1;
+       }
+ 
++#ifdef HAVE_STRERROR_R
+       strerror_r(rc, message, 64);
++#else
++      strncpy (message, strerror (rc), 64);
++      message[63]='\0';
++#endif
+       fputs("Error invoking pthread_create: ", stderr);
+       fputs(message, stderr);
+       fputc('\n', stderr);
diff --git a/audio/gdcd/files/patch-ah b/audio/gdcd/files/patch-ah
new file mode 100644
index 000000000000..e4d0eebfde21
--- /dev/null
+++ b/audio/gdcd/files/patch-ah
@@ -0,0 +1,15 @@
+--- source/coverart.c.orig	Sun Jan  9 06:34:31 2000
++++ source/coverart.c	Thu Jun 29 01:12:36 2000
+@@ -197,7 +197,12 @@
+          return -1;
+       }
+ 
++#ifdef HAVE_STRERROR_R
+       strerror_r(rc, message, 64);
++#else
++      strncpy (message, strerror (rc), 64);
++      message[63]='\0';
++#endif
+       fputs("Error invoking pthread_create: ", stderr);
+       fputs(message, stderr);
+       fputc('\n', stderr);
diff --git a/audio/gdcd/pkg-plist b/audio/gdcd/pkg-plist
index 7da80cc91ada..b8846303a9d2 100644
--- a/audio/gdcd/pkg-plist
+++ b/audio/gdcd/pkg-plist
@@ -11,3 +11,4 @@ share/pixmaps/gdcd/rock.png
 share/pixmaps/gdcd/soundtrack.png
 share/pixmaps/gdcd/unknown.png
 @dirrm share/pixmaps/gdcd
+@unexec rmdir %d/share/pixmaps 2>/dev/null || true