Date: Mon, 3 Jul 2000 10:24:24 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19674: Update port: audio/gdcd to 0.2.1 Message-ID: <20000703172424.191DF37BA14@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19674 >Category: ports >Synopsis: Update port: audio/gdcd to 0.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 03 10:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.2.1 New file: patches/patch-ae patches/patch-af patches/patch-ag patches/patch-ah Remove file: patches/patch-aa patches/patch-ab patches/patch-ac patches/patch-ad >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/gdcd/Makefile audio/gdcd/Makefile --- /usr/ports/audio/gdcd/Makefile Thu Jun 22 19:04:41 2000 +++ audio/gdcd/Makefile Thu Jun 29 02:32:02 2000 @@ -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 -urN /usr/ports/audio/gdcd/files/md5 audio/gdcd/files/md5 --- /usr/ports/audio/gdcd/files/md5 Sat Jun 3 14:29:02 2000 +++ audio/gdcd/files/md5 Wed Jun 28 03:55:50 2000 @@ -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 -urN /usr/ports/audio/gdcd/patches/patch-aa audio/gdcd/patches/patch-aa --- /usr/ports/audio/gdcd/patches/patch-aa Sat Jun 3 14:29:03 2000 +++ audio/gdcd/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,15 +0,0 @@ ---- source/thread.c.orig Mon Aug 30 03:10:11 1999 -+++ source/thread.c Fri Sep 3 19:00:27 1999 -@@ -86,7 +86,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 -urN /usr/ports/audio/gdcd/patches/patch-ab audio/gdcd/patches/patch-ab --- /usr/ports/audio/gdcd/patches/patch-ab Sat Jun 3 14:29:03 2000 +++ audio/gdcd/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Fri Sep 3 19:11:40 1999 -+++ configure Fri Sep 3 19:11:56 1999 -@@ -1145,7 +1145,7 @@ - echo "$ac_t""$host" 1>&6 - - --IMAGE_PATH='${prefix}/share/gdcd' -+IMAGE_PATH='${prefix}/share/pixmaps/gdcd' - - - trap '' 1 2 15 diff -urN /usr/ports/audio/gdcd/patches/patch-ac audio/gdcd/patches/patch-ac --- /usr/ports/audio/gdcd/patches/patch-ac Sat Jun 3 14:29:03 2000 +++ audio/gdcd/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,33 +0,0 @@ ---- images/Makefile.in.orig Fri Sep 3 03:56:10 1999 -+++ images/Makefile.in Fri Sep 3 19:15:08 1999 -@@ -166,18 +166,18 @@ - - - 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) ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} blues.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} data.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} folk.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} jazz.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} misc.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} newage.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} nodisc.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} reggae.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} rock.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} soundtrack.png ${prefix}/share/pixmaps/gdcd -+ ${BSD_INSTALL_DATA} unknown.png ${prefix}/share/pixmaps/gdcd - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN /usr/ports/audio/gdcd/patches/patch-ad audio/gdcd/patches/patch-ad --- /usr/ports/audio/gdcd/patches/patch-ad Thu Jun 22 19:04:42 2000 +++ audio/gdcd/patches/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- source/Makefile.in Thu Sep 2 21:56:08 1999 -+++ source/Makefile.in.new Tue Jun 20 18:13:43 2000 -@@ -68,8 +68,8 @@ - bin_PROGRAMS = gdcd - gdcd_SOURCES = gdcd.c thread.c cddb.c coverart.c - --CFLAGS = @CFLAGS@ `gtk-config --cflags` -DIMAGE_PATH=\"@IMAGE_PATH@\" --LDFLAGS = @LDFLAGS@ `gtk-config --libs` -lcdaudio -lgdk_imlib -lpthread -+CFLAGS = @CFLAGS@ `gtk12-config --cflags` `imlib-config --cflags` -DIMAGE_PATH=\"@IMAGE_PATH@\" -+LDFLAGS = @LDFLAGS@ `gtk12-config --libs` `imlib-config --libs` -lcdaudio -lgdk_imlib -pthread - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff -urN /usr/ports/audio/gdcd/patches/patch-ae audio/gdcd/patches/patch-ae --- /usr/ports/audio/gdcd/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ audio/gdcd/patches/patch-ae Thu Jun 29 01:37:01 2000 @@ -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 -urN /usr/ports/audio/gdcd/patches/patch-af audio/gdcd/patches/patch-af --- /usr/ports/audio/gdcd/patches/patch-af Thu Jan 1 09:00:00 1970 +++ audio/gdcd/patches/patch-af Thu Jun 29 01:54:08 2000 @@ -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 -urN /usr/ports/audio/gdcd/patches/patch-ag audio/gdcd/patches/patch-ag --- /usr/ports/audio/gdcd/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ audio/gdcd/patches/patch-ag Thu Jun 29 01:13:02 2000 @@ -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 -urN /usr/ports/audio/gdcd/patches/patch-ah audio/gdcd/patches/patch-ah --- /usr/ports/audio/gdcd/patches/patch-ah Thu Jan 1 09:00:00 1970 +++ audio/gdcd/patches/patch-ah Thu Jun 29 01:13:19 2000 @@ -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 -urN /usr/ports/audio/gdcd/pkg/PLIST audio/gdcd/pkg/PLIST --- /usr/ports/audio/gdcd/pkg/PLIST Sat Jun 3 14:29:03 2000 +++ audio/gdcd/pkg/PLIST Thu Jun 29 01:49:28 2000 @@ -11,3 +11,4 @@ share/pixmaps/gdcd/soundtrack.png share/pixmaps/gdcd/unknown.png @dirrm share/pixmaps/gdcd +@unexec rmdir %d/share/pixmaps 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000703172424.191DF37BA14>