diff options
author | heinz <heinz> | 2008-11-23 23:40:12 +0000 |
---|---|---|
committer | heinz <heinz> | 2008-11-23 23:40:12 +0000 |
commit | e7d3a324a5d09c7cf9a322143767afb9b44791ab (patch) | |
tree | dcfcdcf107935a850cbd6d1d5556e83d7f3c24be /sysutils/dvdisaster | |
parent | 6480d6d2fbd1b62579f8d01cb9346dbcf7b79965 (diff) | |
download | pkgsrc-e7d3a324a5d09c7cf9a322143767afb9b44791ab.tar.gz |
Updated to version 0.70.6
Maintainer update by Sergey Svishchev (small changes by Klaus Heinz)
Pkgsrc changes:
- Required version of GTK2 is now 2.6.0 and up.
- Many pkgsrc patches related to NetBSD support (scsi-netbsd.c, patch-ab,
patch-ac, patch-ae and part of patch-ad) were committed to the stable
branch of dvdisaster (0.70.x). The rest (except for patch-ah) was
integrated into the unstable branch (0.71.x).
Changes since version 0.70.4:
=============================
NOTE to downstream maintainers:
- Keep up the good work! Thanks :-)
- GTK+ dependency has been bumped up to >= 2.6.0 (was formerly 2.0)
0.70 (pl6) 04-03-2008
- rolled back the Windows filename encoding fixes;
they caused large file support to be broken
Thanks to Markus G. for bringing this to my attention!
0.70 (pl5) 24-02-2008 various backports from 0.71.24:
- enlarged scsi timeout for Linux as newer Kernels seem
to freeze on timeout
- Windows filename encoding fixes
Diffstat (limited to 'sysutils/dvdisaster')
-rw-r--r-- | sysutils/dvdisaster/Makefile | 22 | ||||
-rw-r--r-- | sysutils/dvdisaster/PLIST | 3 | ||||
-rw-r--r-- | sysutils/dvdisaster/distinfo | 17 | ||||
-rw-r--r-- | sysutils/dvdisaster/files/scsi-netbsd.c | 185 | ||||
-rw-r--r-- | sysutils/dvdisaster/patches/patch-ab | 24 | ||||
-rw-r--r-- | sysutils/dvdisaster/patches/patch-ac | 136 | ||||
-rw-r--r-- | sysutils/dvdisaster/patches/patch-ad | 28 | ||||
-rw-r--r-- | sysutils/dvdisaster/patches/patch-ae | 51 | ||||
-rw-r--r-- | sysutils/dvdisaster/patches/patch-af | 3 | ||||
-rw-r--r-- | sysutils/dvdisaster/patches/patch-ag | 3 |
10 files changed, 28 insertions, 444 deletions
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile index fc46f5436ac..5624c9be6e1 100644 --- a/sysutils/dvdisaster/Makefile +++ b/sysutils/dvdisaster/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2007/12/09 23:02:49 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2008/11/23 23:40:12 heinz Exp $ # -DISTNAME= dvdisaster-0.70.4 -PKGREVISION= 2 +DISTNAME= dvdisaster-0.70.6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdisaster/} EXTRACT_SUFX= .tar.bz2 @@ -18,26 +17,25 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= gettext-tools>=0.14:../../devel/gettext-tools +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 + ONLY_FOR_COMPILER= gcc USE_LANGUAGES= c USE_PKGLOCALEDIR= yes USE_TOOLS+= bash gmake pkg-config HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --docdir=${PREFIX:Q}/share/doc -CONFIGURE_ARGS+= --localedir=${PREFIX:Q}/${PKGLOCALEDIR}/locale -CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR} -CONFIGURE_ARGS+= --buildroot=${DESTDIR:Q} +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc +CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale +CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --buildroot=${DESTDIR} CONFIGURE_ARGS+= --with-embedded-src-path=no CONFIG_SHELL= ${TOOLS_PATH.bash} MAKE_FILE= GNUmakefile -pre-configure: - cp ${FILESDIR:Q}/scsi-netbsd.c ${WRKSRC:Q} - post-install: - rm -f ${DESTDIR:Q}${PREFIX:Q}/bin/dvdisaster-uninstall.sh + rm -f ${DESTDIR}${PREFIX}/bin/dvdisaster-uninstall.sh .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/sysutils/dvdisaster/PLIST b/sysutils/dvdisaster/PLIST index 792841e021f..14789c1cd55 100644 --- a/sysutils/dvdisaster/PLIST +++ b/sysutils/dvdisaster/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/11/23 23:40:12 heinz Exp $ bin/dvdisaster share/doc/${PKGNAME}/CHANGELOG share/doc/${PKGNAME}/COPYING @@ -236,6 +236,7 @@ share/doc/${PKGNAME}/images/scratch-img.jpg ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/dvdisaster.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dvdisaster.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dvdisaster.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dvdisaster.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dvdisaster.mo ${PKGMANDIR}/cs/man1/dvdisaster.1 ${PKGMANDIR}/de/man1/dvdisaster.1 diff --git a/sysutils/dvdisaster/distinfo b/sysutils/dvdisaster/distinfo index c86e7dfa04f..ff707c2aef1 100644 --- a/sysutils/dvdisaster/distinfo +++ b/sysutils/dvdisaster/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.2 2007/08/05 19:15:47 joerg Exp $ +$NetBSD: distinfo,v 1.3 2008/11/23 23:40:12 heinz Exp $ -SHA1 (dvdisaster-0.70.4.tar.bz2) = 0ab5fe59d4c91e77c2f73b389485d0f5443d8873 -RMD160 (dvdisaster-0.70.4.tar.bz2) = 917457581309db33aef5ceddc7dddbd2ef084497 -Size (dvdisaster-0.70.4.tar.bz2) = 1148733 bytes +SHA1 (dvdisaster-0.70.6.tar.bz2) = e5d6b301f2f9b1139a9ac5fa596bf4df9f7063c4 +RMD160 (dvdisaster-0.70.6.tar.bz2) = 8b88b3b12717b916e1877b6586fc777d64f6df26 +Size (dvdisaster-0.70.6.tar.bz2) = 1167208 bytes SHA1 (patch-aa) = 97fe33bdc514925041718992b28d75b672b4be0c -SHA1 (patch-ab) = 837785ee7f012dfcb63e1cd1bab454c8015a0c90 -SHA1 (patch-ac) = b33ae1b4142f20c16219725bb6aa03bdb2365d13 -SHA1 (patch-ad) = 3cf91a78105fac99e176fa261b10989a9c9956b6 -SHA1 (patch-ae) = 9386da56b3668141eed764714a1d07a7bb1700c4 -SHA1 (patch-af) = 33069cda271d85634189b712a1361ed2232dc804 -SHA1 (patch-ag) = 3dad3065b93817f091dea422787192e02e0e52d8 +SHA1 (patch-ad) = 56355c919f1b1cd4c716d1bf3e9a762afb8490e2 +SHA1 (patch-af) = c3819a7ea476878b293cc37005047852f52804f6 +SHA1 (patch-ag) = 4f941f14abcaba457dbec99935d07e91276df597 SHA1 (patch-ah) = 9cb1e03dc8c13e560a2f862811a4e828563db112 diff --git a/sysutils/dvdisaster/files/scsi-netbsd.c b/sysutils/dvdisaster/files/scsi-netbsd.c deleted file mode 100644 index 4f702e543d5..00000000000 --- a/sysutils/dvdisaster/files/scsi-netbsd.c +++ /dev/null @@ -1,185 +0,0 @@ -/* dvdisaster: Additional error correction for optical media. - * Copyright (C) 2004-2007 Carsten Gnoerlich. - * Project home page: http://www.dvdisaster.com - * Email: carsten@dvdisaster.com -or- cgnoerlich@fsfe.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, - * or direct your browser at http://www.gnu.org. - */ - -/* NetBSD support by Sergey Svishchev <svs@ropnet.ru>. - */ - -#include "dvdisaster.h" - -#include "scsi-layer.h" -#include "udf.h" - -#ifdef SYS_NETBSD - -#include <sys/device.h> -#include <sys/param.h> -#include <sys/sysctl.h> -#include <sys/scsiio.h> -#include <util.h> - - -char* DefaultDevice() -{ DeviceHandle *dh; - char *disknames, *p, raw; - int dev_type, sysctl_mib[2]; - size_t sysctl_len; - - raw = 'a' + getrawpartition(); - - sysctl_mib[0] = CTL_HW; - sysctl_mib[1] = HW_DISKNAMES; - if (-1 == sysctl(sysctl_mib, 2, NULL, &sysctl_len, NULL, 0)) { - PrintLog("Failed to get value of sysctl `hw.disknames'\n"); - return g_strdup("no_drives"); - } - if (!(disknames = g_malloc(sysctl_len))) { - PrintLog("Out of memory constructing scan device list\n"); - return g_strdup("no_drives"); - } - if (-1 == sysctl(sysctl_mib, 2, disknames, &sysctl_len, NULL, 0)) { - PrintLog("Failed to get value of sysctl `hw.disknames'\n"); - g_free(disknames); - return g_strdup("no_drives"); - } - - dh = g_malloc(sizeof(DeviceHandle)); - - for (p = strtok(disknames, " "); p; p = strtok(NULL, " ")) - { - if(!strncmp(p,"cd",2)) - { char buf[80]; - - sprintf(buf,"/dev/r%s%c", p, raw); - - memset(dh, 0, sizeof(DeviceHandle)); - dh->fd = open(buf, O_RDONLY | O_NONBLOCK); - dh->device = buf; - - if(dh->fd < 0) /* device not even present */ - continue; - - dev_type = InquireDevice(dh, 1); - close(dh->fd); - - if(dev_type != 5) /* not a CD/DVD ROM */ - continue; - - g_ptr_array_add(Closure->deviceNodes, g_strdup(buf)); - sprintf(buf, "%s (/dev/r%s%c)", dh->devinfo, p, raw); - g_ptr_array_add(Closure->deviceNames, g_strdup(buf)); - } - } - - g_free(dh); - - if(Closure->deviceNodes->len) - return g_strdup(g_ptr_array_index(Closure->deviceNodes, 0)); - else - { PrintLog(_("No CD/DVD drives found.\n" - "No drives will be pre-selected.\n")); - - return g_strdup("no_drives"); - } -} - -DeviceHandle* OpenDevice(char *device) -{ DeviceHandle *dh; - - dh = g_malloc0(sizeof(DeviceHandle)); - dh->fd = open(device, O_RDONLY | O_NONBLOCK); - - if(dh->fd < 0) - { g_free(dh); - Stop(_("Could not open %s: %s"),device, strerror(errno)); - return NULL; - } - - dh->device = g_strdup(device); - - return dh; -} - -void CloseDevice(DeviceHandle *dh) -{ - if(dh->fd) - close(dh->fd); - if(dh->device) - g_free(dh->device); - if(dh->rs02Header) - g_free(dh->rs02Header); - if(dh->mediumDescr) - g_free(dh->mediumDescr); - if(dh->isoInfo) - FreeIsoInfo(dh->isoInfo); - if(dh->defects) - FreeBitmap(dh->defects); - g_free(dh); -} - -int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char *buf, int size, Sense *sense, int data_mode) -{ struct scsireq sc; - int rc; - - /* prepare the scsi request */ - - memset(&sc, 0, sizeof(sc)); - memcpy(sc.cmd, cmd, cdb_size); - sc.cmdlen = cdb_size; - sc.databuf = (char *)buf; - sc.datalen = size; - sc.senselen = 24; /* Maybe SENSEBUFLEN would be better? -cg */ - sc.timeout = 60000; /* linux uses 5000 = 5 * HZ */ - - switch(data_mode) - { case DATA_READ: - sc.flags = SCCMD_READ; - break; - default: - Stop(_("illegal data_mode: %d"),data_mode); - } - - /* Send the request and save the sense data. */ - - rc = ioctl(dh->fd, SCIOCCOMMAND, &sc); - memcpy(sense, sc.sense, sc.senselen_used); - - /* See what we've got back */ - - if(rc<0) return rc; /* does not happen on SCSI errors */ - - switch(sc.retsts) - { case SCCMD_OK: /* everything went fine */ - return 0; - case SCCMD_TIMEOUT: /* we don't know how to handle that yet */ - PrintLog("SendPacket() - SCSI timeout\n"); - return -1; - case SCCMD_BUSY: /* same here */ - PrintLog("SendPacket() - target busy\n"); - return -1; - case SCCMD_SENSE: /* SCSI error occurred, sense data available */ - return -1; - default: /* something other went wrong */ - return -1; - } - - return -1; /* unreachable */ -} -#endif /* SYS_NETBSD */ diff --git a/sysutils/dvdisaster/patches/patch-ab b/sysutils/dvdisaster/patches/patch-ab deleted file mode 100644 index ebba75fe7ac..00000000000 --- a/sysutils/dvdisaster/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ - - make it work with NetBSD's SCSI layer - ---- scsi-layer.h.orig 2007-01-20 15:44:49.000000000 +0000 -+++ scsi-layer.h 2007-01-27 17:36:15.000000000 +0000 -@@ -117,7 +117,7 @@ - } Sense; - #endif - --#ifdef SYS_UNKNOWN -+#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD) - #define MAX_CDB_SIZE 16 /* longest possible SCSI command */ - - /* This is actually the little endian version of the -@@ -177,7 +177,7 @@ - - typedef struct _DeviceHandle - { --#ifdef SYS_LINUX -+#if defined(SYS_LINUX) || defined(SYS_NETBSD) - int fd; /* device file descriptor */ - #endif - #ifdef SYS_FREEBSD diff --git a/sysutils/dvdisaster/patches/patch-ac b/sysutils/dvdisaster/patches/patch-ac deleted file mode 100644 index 098a8261563..00000000000 --- a/sysutils/dvdisaster/patches/patch-ac +++ /dev/null @@ -1,136 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ - - - Add system type SYS_NETBSD - - - Process "--with*" options before "--*dir=*". Since the latter is a more - general expression it catches "--with-*dir" when it should not. - - - Allow several "-" characters in options (provided by upstream author) - ---- scripts/bash-based-configure.orig 2006-04-18 20:14:45.000000000 +0200 -+++ scripts/bash-based-configure -@@ -60,7 +60,7 @@ - # WITH_OPTION name default adds -DWITH_OPTION_VALUE for -with-option=value args - # to CFG_WITH_OPTIONS, - --CONFIGURE_VERSION="0.51" -+CONFIGURE_VERSION="0.51nb2" - - echo "Bash based configure V$CONFIGURE_VERSION" - echo -@@ -129,6 +129,15 @@ case "$cfg_uname" in - } - ;; - -+ NetBSD*) cfg_system=netbsd -+ CFG_SYS_OPTIONS="-DSYS_NETBSD" -+ CFG_EXE_SUFFIX="" -+ CFG_SYS_LDFLAGS="-lutil" -+ function add_linker_flags() -+ { lflags_return="-L$1 -Wl,-rpath,$1 $2" -+ } -+ ;; -+ - *) cfg_system=unknown-system - CFG_SYS_OPTIONS="-DSYS_UNKNOWN" - CFG_EXE_SUFFIX="" -@@ -188,6 +197,18 @@ do - -buildroot=* | --buildroot=*) - cfg_buildroot=$cfg_optarg ;; - -+ # process the -with-foo=bar into $cfg_with_foo=bar -+ -+ -with-*=* | --with-*=*) -+ eval `echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 'y/-/_/'` ;; -+ -+ # process -with-foo into $cfg_with_foo=yes -+ -+ -with-* | --with-*) -+ cfg_eval=`echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 'y/-/_/'` -+ cfg_eval="$cfg_eval=yes" -+ eval "$cfg_eval" ;; -+ - -*dir=* | --*dir=*) - eval `echo "$cfg_opt" | sed -e 's/[-]*/cfg_/' ` ;; - -@@ -201,18 +222,6 @@ do - -*-libraries=*) - eval `echo "$cfg_opt" | sed -e 's/[-]*/cfg_/' -e 's/-libraries/_lib/'` ;; - -- # process the -with-foo=bar into $cfg_with_foo=bar -- -- -with-*=* | --with-*=*) -- eval `echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 's/-/_/'` ;; -- -- # process -with-foo into $cfg_with_foo=yes -- -- -with-* | --with-*) -- cfg_eval=`echo "$cfg_opt" | sed -e 's/[-]*with-/cfg_with_/' -e 's/-/_/'` -- cfg_eval="$cfg_eval=yes" -- eval "$cfg_eval" ;; -- - -version | --version) - exit 0 ;; - -@@ -342,15 +351,16 @@ function REQUIRE_GCC() - # in one sweep at the Makefile.config generation. - - function WITH_OPTION() --{ local option_name=`echo $1 | sed -e 's/-/_/'` -+{ local option_name=$1 -+ local cooked_name=`echo $1 | sed -e 'y/-/_/'` - local default="$2" - local description="$3" - - # first check number of arguments and deal with help mode - -- if test -z "$option_name" || test -z "$default"; then -+ if test -z "$cooked_name" || test -z "$default"; then - echo "WITH_OPTION needs at last two arguments" -- return option_name -+ return cooked_name - fi - - if test -n "$cfg_help_mode"; then -@@ -362,31 +372,31 @@ function WITH_OPTION() - - echo -n " with $option_name: " - -- eval "cfg_forced_arg=\$cfg_force_with_$option_name" -+ eval "cfg_forced_arg=\$cfg_force_with_$cooked_name" - if test -n "$cfg_forced_arg"; then - echo "$cfg_forced_arg (forced by previous tests)" -- CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${option_name}_$cfg_forced_arg" -- eval "cfg_with_$option_name=\$cfg_forced_arg" -- export "cfg_with_$option_name" -+ CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${cooked_name}_$cfg_forced_arg" -+ eval "cfg_with_$cooked_name=\$cfg_forced_arg" -+ export "cfg_with_$cooked_name" - return 0 - fi - - # now start the real processing -- # if $cfg_with_$option_name is unset, we set it to the default value -+ # if $cfg_with_$cooked_name is unset, we set it to the default value - # so that the programmer can write custom shell functions depending on it. - -- eval "cfg_user_arg=\$cfg_with_$option_name" -+ eval "cfg_user_arg=\$cfg_with_$cooked_name" - - if test -z "$cfg_user_arg"; then - echo "$default" -- CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${option_name}_$default" -- eval "cfg_with_$option_name=\$default" -+ CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${cooked_name}_$default" -+ eval "cfg_with_$cooked_name=\$default" - else - echo "$cfg_user_arg (user supplied)" -- CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${option_name}_$cfg_user_arg" -+ CFG_WITH_OPTIONS="$CFG_WITH_OPTIONS -Dwith_${cooked_name}_$cfg_user_arg" - fi - -- export "cfg_with_$option_name" -+ export "cfg_with_$cooked_name" - return 0 - } - diff --git a/sysutils/dvdisaster/patches/patch-ad b/sysutils/dvdisaster/patches/patch-ad index a3c54c5f7d3..561102ed778 100644 --- a/sysutils/dvdisaster/patches/patch-ad +++ b/sysutils/dvdisaster/patches/patch-ad @@ -1,11 +1,9 @@ -$NetBSD: patch-ad,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ +$NetBSD: patch-ad,v 1.2 2008/11/23 23:40:12 heinz Exp $ - Honor configure option --with-embedded-src-path + (already committed in unstable version upstream) - - Unification of SYS_(LINUX|FREEBSD|DARWIN|UNKNOWN) to "ifndef SYS_MINGW" - taken from upstream CVS sources. - ---- closure.c.orig 2007-01-20 16:44:59.000000000 +0100 +--- closure.c.orig 2008-03-04 10:01:15.000000000 +0000 +++ closure.c @@ -174,10 +174,13 @@ static void get_base_dirs() char *appdata; @@ -22,28 +20,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ #ifndef SYS_MINGW if(!stat(SRCDIR, &mystat)) { Closure->binDir = g_strdup(SRCDIR); -@@ -187,12 +190,14 @@ static void get_base_dirs() +@@ -187,6 +190,8 @@ static void get_base_dirs() } #endif +#endif /* WITH_EMBEDDED_SRC_PATH_YES */ + /*** Otherwise try the installation directory. - On Linux this is a hardcoded directory. + On Unices this is a hardcoded directory. Windows has binary distributions with no prior known installation place, - but luckily it provides a way for figuring out that location. */ - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) || defined(SYS_UNKNOWN) -+#ifndef SYS_MINGW - if(!stat(BINDIR, &mystat)) - Closure->binDir = g_strdup(BINDIR); - -@@ -212,7 +217,7 @@ static void get_base_dirs() - /*** The location of the dotfile depends on the operating system. - Under Unix the users home directory is used. */ - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) || defined(SYS_UNKNOWN) -+#ifndef SYS_MINGW - find_dotfile: - - Closure->dotFile = g_strdup_printf("%s/.dvdisaster", g_getenv("HOME")); diff --git a/sysutils/dvdisaster/patches/patch-ae b/sysutils/dvdisaster/patches/patch-ae deleted file mode 100644 index b6093793f52..00000000000 --- a/sysutils/dvdisaster/patches/patch-ae +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ - - On NetBSD behave similar to other UN*X variants regarding the browser. - ---- show-manual.c.orig 2007-01-20 16:44:59.000000000 +0100 -+++ show-manual.c -@@ -21,7 +21,7 @@ - - #include "dvdisaster.h" - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN) - #include <sys/wait.h> - #endif - -@@ -34,7 +34,7 @@ - *** Ask user to specify his browser - ***/ - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN) - #define SEARCH_BUTTON 1 - - typedef struct -@@ -172,7 +172,7 @@ static void msg_destroy_cb(GtkWidget *wi - bi->msg = NULL; - } - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN) - - /* - * The following list of browsers and html wrappers -@@ -270,7 +270,7 @@ static gboolean browser_timeout_func(gpo - * Invoke the browser - */ - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN) - static void try_browser(browser_info *bi) - { pid_t pid; - -@@ -390,7 +390,7 @@ void ShowHTML(char *target) - g_timeout_add(1000, browser_timeout_func, (gpointer)bi); - #endif - --#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_DARWIN) -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_DARWIN) - /* Try the first browser */ - - browser_index = 0; diff --git a/sysutils/dvdisaster/patches/patch-af b/sysutils/dvdisaster/patches/patch-af index bdfb7615a52..9ec2582e2ea 100644 --- a/sysutils/dvdisaster/patches/patch-af +++ b/sysutils/dvdisaster/patches/patch-af @@ -1,7 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ +$NetBSD: patch-af,v 1.2 2008/11/23 23:40:12 heinz Exp $ - Add option "--with-embedded-src-path", default value is "yes" to keep the current behaviour. + (already committed in unstable version upstream) --- configure.orig 2007-01-20 13:30:22.000000000 +0100 +++ configure diff --git a/sysutils/dvdisaster/patches/patch-ag b/sysutils/dvdisaster/patches/patch-ag index fa683b88e4a..c7336444a6f 100644 --- a/sysutils/dvdisaster/patches/patch-ag +++ b/sysutils/dvdisaster/patches/patch-ag @@ -1,7 +1,8 @@ -$NetBSD: patch-ag,v 1.1.1.1 2007/06/08 20:19:13 heinz Exp $ +$NetBSD: patch-ag,v 1.2 2008/11/23 23:40:12 heinz Exp $ - Use SRCDIR only when configure option --with-embedded-src-path is set to yes. + (already committed in unstable version upstream) --- dvdisaster.c.orig 2007-01-20 16:44:59.000000000 +0100 +++ dvdisaster.c |