pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/xcdroast Update to 0.98alpha15:
details: https://anonhg.NetBSD.org/pkgsrc/rev/2355971da19f
branches: trunk
changeset: 465369:2355971da19f
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Sun Dec 28 19:29:21 2003 +0000
description:
Update to 0.98alpha15:
* GTK2 support.
* updated lot of translations, added romanian, latvian and albanian.
* numerous bug fixes.
* included a contrib-directory with the sources with some useful stuff sent
to me by X-CD-Roast users.
diffstat:
sysutils/xcdroast/Makefile | 25 +++--
sysutils/xcdroast/PLIST | 48 +---------
sysutils/xcdroast/distinfo | 8 +-
sysutils/xcdroast/patches/patch-ac | 166 -------------------------------------
4 files changed, 26 insertions(+), 221 deletions(-)
diffs (truncated from 332 to 300 lines):
diff -r 303949390c02 -r 2355971da19f sysutils/xcdroast/Makefile
--- a/sysutils/xcdroast/Makefile Sun Dec 28 19:22:12 2003 +0000
+++ b/sysutils/xcdroast/Makefile Sun Dec 28 19:29:21 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/08/30 22:51:38 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/28 19:29:21 jmmv Exp $
-DISTNAME= xcdroast-0.98alpha14
-PKGNAME= xcdroast-0.98a14
+DISTNAME= xcdroast-0.98alpha15
+PKGNAME= xcdroast-0.98a15
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
@@ -9,17 +9,21 @@
HOMEPAGE= http://www.xcdroast.org/
COMMENT= Graphical user interface for the command-line cdrecord-tools
-DEPENDS+= cdrecord-xcdroast-0.98a13.*:../cdrecord-xcdroast
+BUILD_USES_MSGFMT= YES
-.include "../../mk/bsd.prefs.mk"
+DEPENDS+= cdrecord-xcdroast-0.98a15.*:../cdrecord-xcdroast
USE_BUILDLINK2= YES
+USE_GMAKE= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
+
+CONFIGURE_ARGS+= --enable-gtk2
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-USE_GMAKE= yes
+
+.include "../../mk/bsd.prefs.mk"
.if ${_OPSYS_HAS_OSSAUDIO} == "yes"
CFLAGS+= -DHAVE_OSS
@@ -28,7 +32,7 @@
.endif
DOCDIR= ${PREFIX}/share/doc/xcdroast
-DOCFILES= DOCUMENTATION FAQ README.nonroot
+DOCFILES= DOCUMENTATION FAQ README.nonroot manual/xcdroast-manual.pdf
HTMLDIR= ${PREFIX}/share/doc/html/xcdroast
SUPPORT_FILES= /dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
@@ -47,11 +51,10 @@
for file in ${DOCFILES}; do \
${INSTALL_DATA} $${file} ${DOCDIR}; \
done)
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- ${CP} -r ${WRKSRC}/doc/manual/* ${HTMLDIR}
-# gdk-pixbuf implies gtk, glib, gettext-lib
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pcre/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 303949390c02 -r 2355971da19f sysutils/xcdroast/PLIST
--- a/sysutils/xcdroast/PLIST Sun Dec 28 19:22:12 2003 +0000
+++ b/sysutils/xcdroast/PLIST Sun Dec 28 19:29:21 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/05 16:15:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/28 19:29:21 jmmv Exp $
bin/xcdroast
lib/xcdroast-0.98/bin/cddbtool
lib/xcdroast-0.98/bin/rmtool
@@ -17,47 +17,10 @@
lib/xcdroast-0.98/icons/xcdrlogo.gif
lib/xcdroast-0.98/sound/test.wav
man/man1/xcdroast.1
-share/doc/html/xcdroast/README.txt
-share/doc/html/xcdroast/create.html
-share/doc/html/xcdroast/createaudio.html
-share/doc/html/xcdroast/de.staerk.css
-share/doc/html/xcdroast/duplicate.html
-share/doc/html/xcdroast/dvd.html
-share/doc/html/xcdroast/fdl.html
-share/doc/html/xcdroast/first.html
-share/doc/html/xcdroast/glossary.html
-share/doc/html/xcdroast/img/bootable.gif
-share/doc/html/xcdroast/img/createaudiolayout.gif
-share/doc/html/xcdroast/img/createcd.gif
-share/doc/html/xcdroast/img/duplicatecd.gif
-share/doc/html/xcdroast/img/error-redslash.gif
-share/doc/html/xcdroast/img/errorcalculating.gif
-share/doc/html/xcdroast/img/errordiskspace.gif
-share/doc/html/xcdroast/img/initial.gif
-share/doc/html/xcdroast/img/layouttracks.gif
-share/doc/html/xcdroast/img/links.gif
-share/doc/html/xcdroast/img/mainmenu.gif
-share/doc/html/xcdroast/img/oben.gif
-share/doc/html/xcdroast/img/ordner.gif
-share/doc/html/xcdroast/img/punkt.gif
-share/doc/html/xcdroast/img/readtracks.gif
-share/doc/html/xcdroast/img/rechts.gif
-share/doc/html/xcdroast/img/setup.gif
-share/doc/html/xcdroast/img/tooltip.gif
-share/doc/html/xcdroast/img/unten.gif
-share/doc/html/xcdroast/img/warningnodvdkey.gif
-share/doc/html/xcdroast/img/warningnot9660.gif
-share/doc/html/xcdroast/img/writecd.gif
-share/doc/html/xcdroast/img/writeonthefly.gif
-share/doc/html/xcdroast/img/xcdrlogo.gif
-share/doc/html/xcdroast/index.html
-share/doc/html/xcdroast/model.html
-share/doc/html/xcdroast/prolog.html
-share/doc/html/xcdroast/ripcd.html
-share/doc/html/xcdroast/xcdroast-reference.html
share/doc/xcdroast/DOCUMENTATION
share/doc/xcdroast/FAQ
share/doc/xcdroast/README.nonroot
+share/doc/xcdroast/xcdroast-manual.pdf
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xcdroast.mo
@@ -74,19 +37,22 @@
${PKGLOCALEDIR}/locale/id/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xcdroast.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xcdroast.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xcdroast.mo
+${PKGLOCALEDIR}/locale/sq_AL/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
@dirrm share/doc/xcdroast
-@dirrm share/doc/html/xcdroast/img
-@dirrm share/doc/html/xcdroast
@dirrm lib/xcdroast-0.98/sound
@dirrm lib/xcdroast-0.98/icons
+@comment in cdrecord-xcdroast: @dirrm lib/xcdroast-0.98/bin
+@comment in cdrecord-xcdroast: @dirrm lib/xcdroast-0.98
diff -r 303949390c02 -r 2355971da19f sysutils/xcdroast/distinfo
--- a/sysutils/xcdroast/distinfo Sun Dec 28 19:22:12 2003 +0000
+++ b/sysutils/xcdroast/distinfo Sun Dec 28 19:29:21 2003 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2003/06/05 16:15:48 drochner Exp $
+$NetBSD: distinfo,v 1.10 2003/12/28 19:29:21 jmmv Exp $
-SHA1 (xcdroast-0.98alpha14.tar.gz) = 7055f281ed7b9d9d0854df245a9e136bb5dd622a
-Size (xcdroast-0.98alpha14.tar.gz) = 2870727 bytes
+SHA1 (xcdroast-0.98alpha15.tar.gz) = f354ea9ffe918c4ec11312d5537e6e245730fecc
+Size (xcdroast-0.98alpha15.tar.gz) = 3282794 bytes
+SHA1 (gtk2locale.patch) = bb3d2f2c7edede86af6c367c8b5b09339251250c
+Size (gtk2locale.patch) = 643 bytes
SHA1 (patch-aa) = 0beee32a5550646cd360459d90281cb0ec9a826a
SHA1 (patch-ac) = e43e996872b766885ab1bea2fc5fcbf50cecc90b
SHA1 (patch-ad) = 417a82344e14ae2a9f602254b152337c33afae4a
diff -r 303949390c02 -r 2355971da19f sysutils/xcdroast/patches/patch-ac
--- a/sysutils/xcdroast/patches/patch-ac Sun Dec 28 19:22:12 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2003/06/07 14:37:02 cjep Exp $
---- src/io.c.orig 2003-05-29 15:14:42.000000000 +0200
-+++ src/io.c 2003-06-05 17:56:20.000000000 +0200
-@@ -24,6 +24,14 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <time.h>
-+#ifdef __NetBSD__
-+# include <sys/ioctl.h>
-+# ifdef HAVE_OSS
-+# include <soundcard.h>
-+# else
-+# include <sys/audioio.h>
-+# endif
-+#endif
- #if defined(linux) || defined(__FreeBSD__)
- # include <sys/soundcard.h>
- # include <sys/ioctl.h>
-@@ -1690,22 +1698,22 @@
- struct stat buf;
- #endif
-
--#if defined(sun) || defined(aix) || defined(__OpenBSD__)
-+#if defined(sun) || defined(aix) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- gchar *audiodev;
- #endif
- dsp = NULL;
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- /* for linux check if /dev/dsp or /dev/dsp1 exist */
-
-- if (stat("/dev/dsp",&buf) == 0) {
-- dsp = g_list_append(dsp,"/dev/dsp");
-+ if (stat("@DEVOSSAUDIO@",&buf) == 0) {
-+ dsp = g_list_append(dsp,"@DEVOSSAUDIO@");
- }
- if (stat("/dev/dsp1",&buf) == 0) {
- dsp = g_list_append(dsp,"/dev/dsp1");
- }
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- /* check if the user has any special audio-hardware running,
- which set the AUDIODEV-environment-variable */
- audiodev = getenv("AUDIODEV");
-@@ -1814,15 +1822,15 @@
- struct stat buf;
- # endif
- #endif
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- gchar tmp2[MAXLINE];
- #endif
-
- strcpy(ret,"");
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
-- if (strncmp(dsp,"/dev/dsp",8) == 0) {
-+ if (strncmp(dsp,"@DEVOSSAUDIO@",8) == 0) {
- strcpy(tmp,dsp+8);
- g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp);
-
-@@ -1832,7 +1840,7 @@
- }
- }
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
-
-@@ -3573,10 +3581,10 @@
- #if !(defined(__MACH__) && defined(__APPLE__))
- gint mix;
- #endif
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- gint val;
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- audio_info_t ainfo;
- #endif
- #ifdef hpux
-@@ -3591,7 +3599,7 @@
- return -1;
- }
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
- dodebug(10,"quering mixer %s\n", setupdata.mix_device);
- mix = open(setupdata.mix_device, O_RDWR);
-@@ -3611,7 +3619,7 @@
- return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
-
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- dodebug(10,"quering mixer %s\n", setupdata.mix_device);
- mix = open(setupdata.mix_device, O_RDONLY);
-@@ -3699,7 +3707,7 @@
- #if !(defined(__MACH__) && defined(__APPLE__))
- gint mix;
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- audio_info_t ainfo;
- #endif
- #ifdef aix
-@@ -3717,7 +3725,7 @@
- return -1;
- }
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
- dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
- mix = open(setupdata.mix_device, O_RDWR);
-@@ -3735,7 +3743,7 @@
- close(mix);
-
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
- mix = open(setupdata.mix_device, O_WRONLY);
-@@ -5507,7 +5515,11 @@
- }
Home |
Main Index |
Thread Index |
Old Index