diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile index 9d20fa11b953..74da15d74b99 100644 --- a/sysutils/dvdisaster/Makefile +++ b/sysutils/dvdisaster/Makefile @@ -1,67 +1,77 @@ PORTNAME= dvdisaster -PORTVERSION= 0.79.5 -PORTREVISION= 3 +DISTVERSION= 0.79.10 CATEGORIES= sysutils -MASTER_SITES= http://www.ml1.org.uk/distfiles/ \ - http://www.ancientgeek.org.uk/distfiles/ +MASTER_SITES= https://dvdisaster.jcea.es/downloads/ MAINTAINER= bob@eager.cx COMMENT= Optical disc error correction data and recovery tool -WWW= https://www.bobeager.uk/software.html +WWW= https://dvdisaster.jcea.es LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -USES= gmake gnome pkgconfig -USE_GCC= yes -USE_GNOME= gdkpixbuf2 gtk20 cairo +FLAVORS= default nox11 +FLAVOR?= ${FLAVORS:[1]} +nox11_PKGNAMESUFFIX= -nox11 + +USES= gmake gnome pkgconfig tar:bz2 +USE_GNOME= glib20 -CFLAGS+= -Wno-stringop-overflow -MAKEFILE= GNUmakefile HAS_CONFIGURE= yes CONFIGURE_LOG= configure.log +MAKEFILE= GNUmakefile +MAKE_JOBS_UNSAFE= yes + CONFIGURE_ARGS= --docsubdir="/" \ --localedir=${PREFIX}/share/locale \ - --buildroot=${STAGEDIR} -MAKE_JOBS_UNSAFE= yes + --buildroot=${STAGEDIR} \ + --with-nls=no + +SUB_FILES= pkg-message +FLAVORS_SUB= yes + +.if ${FLAVOR} == default +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 +USE_GNOME+= cairo gdkpixbuf2 gtk20 +CONFIGURE_ARGS+= --with-gui=yes +.endif -PORTDOCS= * -SUB_FILES= pkg-message DEVICES.md DEVICES.html +.if ${FLAVOR} == nox11 +COMMENT+= (without GUI) +CONFIGURE_ARGS+= --with-gui=no +.endif -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_CONFIGURE_ON= --docdir=${DOCSDIR} -NLS_USES= gettext -NLS_CONFIGURE_OFF= -with-nls=no -post-patch: - ${REINPLACE_CMD} -e '/dvdisaster uninstaller/,+19 d' \ - ${WRKSRC}/GNUmakefile.template +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/documentation/${PORTNAME}.en.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 -post-patch-DOCS-off: - ${REINPLACE_CMD} -e 's|THESE_ARE_THE_DEVEL_SOURCES;|GNUmakefile;|; \ - /install -d $$(BUILDROOT)$$(DOCSUBDIR)/,+7 d' \ - ${WRKSRC}/GNUmakefile.template - -post-patch-NLS-off: - ${REINPLACE_CMD} -Ee 's|(PO_LOCALES)|#\1|; \ - s|install -m 644 CREDITS\*|install -m 644 CREDITS\.en|' \ - ${WRKSRC}/GNUmakefile.template +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/devices.txt.in ${STAGEDIR}${DOCSDIR}/devices.txt + ${INSTALL_DATA} ${WRKSRC}/documentation/codec-specs/codecs.pdf ${STAGEDIR}${DOCSDIR} +.if ${FLAVOR} == default + ${INSTALL_DATA} ${WRKSRC}/documentation/user-manual/manual.pdf ${STAGEDIR}${DOCSDIR}/${PORTNAME}.pdf +.endif post-install: +.if ${FLAVOR} == default @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster48.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster16.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster24.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster32.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster48.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster64.png ${STAGEDIR}${PREFIX}/share/pixmaps @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster.desktop ${STAGEDIR}${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/contrib/dvdisaster.desktop ${STAGEDIR}${PREFIX}/share/applications +.endif ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -post-install-DOCS-on: - ${INSTALL_MAN} ${WRKDIR}/DEVICES.md ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKDIR}/DEVICES.html ${STAGEDIR}${DOCSDIR} - .include diff --git a/sysutils/dvdisaster/distinfo b/sysutils/dvdisaster/distinfo index ff8ceb3f0e0b..f40ed779cb72 100644 --- a/sysutils/dvdisaster/distinfo +++ b/sysutils/dvdisaster/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551738342 -SHA256 (dvdisaster-0.79.5.tar.gz) = d6efa1643945fe7b16382f4164a68bdad14de48c8506d844d740cd3a2b143e55 -SIZE (dvdisaster-0.79.5.tar.gz) = 9722312 +TIMESTAMP = 1680992370 +SHA256 (dvdisaster-0.79.10.tar.bz2) = dd0a9ff62f1a48bf73dae26f9bc3ff40e3e9f379ce0c2ddfc8b2f58812207fe8 +SIZE (dvdisaster-0.79.10.tar.bz2) = 8173816 diff --git a/sysutils/dvdisaster/files/DEVICES.html.in b/sysutils/dvdisaster/files/DEVICES.html.in deleted file mode 100644 index d82677ea971d..000000000000 --- a/sysutils/dvdisaster/files/DEVICES.html.in +++ /dev/null @@ -1,80 +0,0 @@ -

Useful hints for dvdisaster

- -

Device access

- -

dvdisaster tries to read /dev/pass* to list available optical drives, -so it will not detect any available drives if the user running -dvdisaster does not have permissions to read /dev/pass*.

- -

The solution is to create the file /etc/devfs.rules, containing -something like the following.

- -
    [localrules=10]
-    add path 'pass*' mode 0775 group mygroup
-
- -

You also need to add this line to /etc/rc.conf:

- -
    devfs_system_ruleset="localrules"
-
- -

You can use anything you like for localrules, and the number does not have to be 10. -See devfs.rules(5) for more details.

- -

If /etc/devfs.rules already exists, add the line starting add to the section for the ruleset -mentioned in /etc/rc.conf.

- -

For this to take effect, either reboot, or issue the command:

- -
    # service devfs restart
-
- -

as root.

- -

Missing optical drives

- -

The most common problem encountered is that dvdisaster does not detect -optical drives on older versions of FreeBSD.

- -

FreeBSD 9.x does not pre-install a uniform CD-ROM driver for SCSI and -ATAPI drives, thus it cannot use any ATAPI drives in an out-of-the-box -FreeBSD 9.x installation. Normally, this can be fixed by loading a -kernel module called atapicam.

- -

Loading the atapicam kernel module by hand

- -

To manually load the required kernel module, issue the command:

- -
    # kldload atapicam
-
- -

To see if any optical drives are available:

- -
    # camcontrol devlist
-    <NAME OF YOUR DRIVE>           at scbus1 target 0 lun 0 (pass0,cd0)
-
- -

Loading the atapicam kernel module permanently

- -

If the above step works, the module can be loaded automatically at boot time by adding -the line:

- -
    atapicam_load="YES"
-
- -

to the file /boot/loader.conf.

- -

Building the atapicam module

- -

If the atapicam kernel module is not available (check the contents -of /boot/kernel) you will need to recompile the kernel with the following -additional device line in the kernel configuration:

- -
    device atapicam
-
- -

This will actually build the module into the kernel. To build it separately, -see make.conf(5).

- -

The devices ata, scbus, cd, and pass are also required, but are included by -default in FreeBSD 6.0 and later.

diff --git a/sysutils/dvdisaster/files/DEVICES.md.in b/sysutils/dvdisaster/files/devices.txt.in similarity index 64% rename from sysutils/dvdisaster/files/DEVICES.md.in rename to sysutils/dvdisaster/files/devices.txt.in index 839886b3878c..5f26b2d0d86b 100644 --- a/sysutils/dvdisaster/files/DEVICES.md.in +++ b/sysutils/dvdisaster/files/devices.txt.in @@ -1,76 +1,75 @@ Useful hints for dvdisaster =========================== Device access ------------- -dvdisaster tries to read `/dev/pass*` to list available optical drives, +dvdisaster tries to read /dev/pass* to list available optical drives, so it will not detect any available drives if the user running -dvdisaster does not have permissions to read `/dev/pass*`. +dvdisaster does not have permissions to read /dev/pass*. -The solution is to create the file `/etc/devfs.rules`, containing +The solution is to create the file /etc/devfs.rules, containing something like the following. [localrules=10] add path 'pass*' mode 0775 group mygroup -You also need to add this line to `/etc/rc.conf`: +You also need to add this line to /etc/rc.conf: devfs_system_ruleset="localrules" -You can use anything you like for `localrules`, and the number does not have to be `10`. -See `devfs.rules(5)` for more details. +You can use anything you like for localrules, and the number does not have to be 10. +See devfs.rules(5) for more details. -If `/etc/devfs.rules` already exists, add the line starting `add` to the section for the ruleset -mentioned in `/etc/rc.conf`. +If /etc/devfs.rules already exists, add the line starting add to the section for the ruleset +mentioned in /etc/rc.conf. For this to take effect, either reboot, or issue the command: # service devfs restart as root. Missing optical drives ---------------------- The most common problem encountered is that dvdisaster does not detect optical drives on older versions of FreeBSD. FreeBSD 9.x does not pre-install a uniform CD-ROM driver for SCSI and ATAPI drives, thus it cannot use any ATAPI drives in an out-of-the-box FreeBSD 9.x installation. Normally, this can be fixed by loading a -kernel module called `atapicam`. +kernel module called atapicam. -### Loading the `atapicam` kernel module by hand +### Loading the atapicam kernel module by hand To manually load the required kernel module, issue the command: # kldload atapicam To see if any optical drives are available: # camcontrol devlist at scbus1 target 0 lun 0 (pass0,cd0) -### Loading the `atapicam` kernel module permanently +### Loading the atapicam kernel module permanently If the above step works, the module can be loaded automatically at boot time by adding the line: atapicam_load="YES" -to the file `/boot/loader.conf`. +to the file /boot/loader.conf. -### Building the `atapicam` module +### Building the atapicam module If the atapicam kernel module is not available (check the contents of /boot/kernel) you will need to recompile the kernel with the following additional device line in the kernel configuration: device atapicam This will actually build the module into the kernel. To build it separately, see `make.conf(5)`. -The devices `ata`, `scbus`, `cd`, and `pass` are also required, but are included by +The devices ata, scbus, cd, and pass are also required, but are included by default in FreeBSD 6.0 and later. - diff --git a/sysutils/dvdisaster/files/patch-GNUmakefile.template b/sysutils/dvdisaster/files/patch-GNUmakefile.template new file mode 100644 index 000000000000..7f441a00dffe --- /dev/null +++ b/sysutils/dvdisaster/files/patch-GNUmakefile.template @@ -0,0 +1,73 @@ +--- GNUmakefile.template.orig 2021-09-24 10:20:49 UTC ++++ GNUmakefile.template +@@ -100,7 +100,7 @@ OFILES = $(CFG_OFILES) + + ${BUILDTMP}/%.o : %.c + @echo "Compiling:" $? +- @$(CC) $(COPTS) -c $? -o $@ ++ $(CC) $(COPTS) -c $? -o $@ + + all: time-stamp dvdisaster + +@@ -112,11 +112,11 @@ time-stamp: + + ${BUILDTMP}/closure.o: closure.c build.h + @echo "Compiling:" closure.c +- @$(CC) $(COPTS) -c closure.c -o ${BUILDTMP}/closure.o ++ $(CC) $(COPTS) -c closure.c -o ${BUILDTMP}/closure.o + + dvdisaster: inlined-icons.h $(OFILES) + @echo "Linking : dvdisaster" +- @$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster ++ $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster + @if test -e locale/de/LC_MESSAGES/dvdisaster.mo \ + || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \ + then echo "not touching locale"; \ +@@ -124,27 +124,32 @@ dvdisaster: inlined-icons.h $(OFILES) + fi + + inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png +- @gdk-pixbuf-csource --raw --name=dvdisaster_read icons/read.png >inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_create icons/create.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_scan icons/scan.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_fix icons/fix.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_verify icons/verify.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h +- @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h ++ @if echo $(WITH_OPTIONS) | grep "WITH_GUI_YES" >/dev/null; then \ ++ echo "Creating: inlined-icons.h"; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_read icons/read.png >inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_create icons/create.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_scan icons/scan.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_fix icons/fix.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_verify icons/verify.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h; \ ++ gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h; \ ++ else \ ++ echo "Skipping: inlined-icons.h"; \ ++ fi + + $(BUILDTMP)/rs-encoder-sse2.o: rs-encoder-sse2.c + @echo "Compiling:" rs-encoder-sse2.c +- @$(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o ++ $(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o + + $(BUILDTMP)/rs-encoder-altivec.o: rs-encoder-altivec.c + @echo "Compiling:" rs-encoder-altivec.c +- @$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o ++ $(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o + + locale: + @$(MAKE) --no-print-directory -C locale diff --git a/sysutils/dvdisaster/files/patch-configure b/sysutils/dvdisaster/files/patch-configure new file mode 100644 index 000000000000..f4b15ec0c294 --- /dev/null +++ b/sysutils/dvdisaster/files/patch-configure @@ -0,0 +1,42 @@ +--- configure.orig 2021-08-26 13:29:58 UTC ++++ configure +@@ -44,7 +44,6 @@ CFG_HAVE_OPTIONS="$CFG_HAVE_OPTIONS -DHAVE_UNSTABLE_RE + # Check for some essential tools. + + REQUIRE_GMAKE +-REQUIRE_GCC + + # Find out and verify the basedir of the source installation, + # and where to install the binary. +@@ -82,7 +81,7 @@ fi + if CHECK_INCLUDE cpuid.h cpuid; then + CFG_HAVE_OPTIONS="$CFG_HAVE_OPTIONS -DHAVE_CPUID" + fi +-CHECK_LIBRARY intl gettext intl ++# CHECK_LIBRARY intl gettext intl + CHECK_LIBRARY cam cam_open_device cam + + # Look for required functions +@@ -100,10 +99,10 @@ if ! CHECK_FUNCTION getopt_long ; then + fi + fi + +-if ! CHECK_FUNCTION gettext ; then +- echo " [previous test forces -with-nls=no]" ++# if ! CHECK_FUNCTION gettext ; then ++# echo " [previous test forces -with-nls=no]" + cfg_force_with_nls=no +-fi ++# fi + + CHECK_FUNCTION round + +@@ -124,7 +123,7 @@ CHECK_ALTIVEC + + PRINT_MESSAGE "\nChecking for additional tools..." + +-if ! EXECUTE_PROGRAM "xgettext --help" xgettext \ ++if ! EXECUTE_PROGRAM "no-xgettext --help" xgettext \ + ||! EXECUTE_PROGRAM "msgmerge --help" msgmerge \ + ||! EXECUTE_PROGRAM "msgfmt --help" msgfmt ; then + echo "* You need to install the GNU gettext tools" diff --git a/sysutils/dvdisaster/files/patch-dvdisaster.h b/sysutils/dvdisaster/files/patch-dvdisaster.h deleted file mode 100644 index 167401cb033b..000000000000 --- a/sysutils/dvdisaster/files/patch-dvdisaster.h +++ /dev/null @@ -1,24 +0,0 @@ ---- dvdisaster.h.orig 2020-06-03 17:37:22 UTC -+++ dvdisaster.h -@@ -425,9 +425,9 @@ typedef struct _CrcBlock - *** forward declarations - ***/ - --struct _RawBuffer *rawbuffer_forward; --struct _DefectiveSectorHeader *dsh_forward; --struct _DeviceHandle *dh_forward; -+extern struct _RawBuffer *rawbuffer_forward; -+extern struct _DefectiveSectorHeader *dsh_forward; -+extern struct _DeviceHandle *dh_forward; - - /*** - *** bitmap.c -@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*); - *** build.h - ***/ - --int buildCount; -+extern int buildCount; - - /*** - *** cacheprobe.h diff --git a/sysutils/dvdisaster/files/patch-icon-factory.c b/sysutils/dvdisaster/files/patch-icon-factory.c deleted file mode 100644 index 8b0eef55ecef..000000000000 --- a/sysutils/dvdisaster/files/patch-icon-factory.c +++ /dev/null @@ -1,11 +0,0 @@ ---- icon-factory.c.orig 2019-03-06 11:28:20 UTC -+++ icon-factory.c -@@ -20,6 +20,8 @@ - * along with dvdisaster. If not, see . - */ - -+#define GDK_PIXBUF_VERSION_MIN_REQUIRED GDK_PIXBUF_VERSION_2_30 -+ - #include "dvdisaster.h" - - #include "inlined-icons.h" diff --git a/sysutils/dvdisaster/files/patch-locale_pt__BR.po b/sysutils/dvdisaster/files/patch-locale_pt__BR.po deleted file mode 100644 index daba989e3903..000000000000 --- a/sysutils/dvdisaster/files/patch-locale_pt__BR.po +++ /dev/null @@ -1,12 +0,0 @@ -Taken from Debian "13-fix-missing-language-field-in-po-files.patch" ---- locale/pt_BR.po.orig 2019-03-06 10:42:22 UTC -+++ locale/pt_BR.po -@@ -11,7 +11,7 @@ msgstr "" - "PO-Revision-Date: 2010-06-09 11:13+0200\n" - "Last-Translator: cg \n" - "Language-Team: Portuguese\n" --"Language: \n" -+"Language: Portuguese\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" diff --git a/sysutils/dvdisaster/files/patch-locale_ru.po b/sysutils/dvdisaster/files/patch-locale_ru.po deleted file mode 100644 index 2bfe02b92f54..000000000000 --- a/sysutils/dvdisaster/files/patch-locale_ru.po +++ /dev/null @@ -1,12 +0,0 @@ -Taken from Debian "13-fix-missing-language-field-in-po-files.patch" ---- locale/ru.po.orig 2019-03-06 10:41:55 UTC -+++ locale/ru.po -@@ -13,7 +13,7 @@ msgstr "" - "PO-Revision-Date: 2009-07-23 08:11+0300\n" - "Last-Translator: Igor Gorbounov \n" - "Language-Team: Russian\n" --"Language: \n" -+"Language: Russian\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" diff --git a/sysutils/dvdisaster/files/patch-scripts_bash-based-configure b/sysutils/dvdisaster/files/patch-scripts_bash-based-configure deleted file mode 100644 index 9b0e8f77cd48..000000000000 --- a/sysutils/dvdisaster/files/patch-scripts_bash-based-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/bash-based-configure.orig 2014-05-28 19:22:05 UTC -+++ scripts/bash-based-configure -@@ -126,7 +126,7 @@ case "$cfg_uname" in - } - ;; - -- FreeBSD*) cfg_system=freebsd-std -+ FreeBSD*|DragonFly*) cfg_system=freebsd-std - CFG_SYS_OPTIONS="-DSYS_FREEBSD" - CFG_SYS_NAME="-DSYS_NAME=\\\"FreeBSD\\\"" - CFG_EXE_SUFFIX="" diff --git a/sysutils/dvdisaster/files/pkg-message.in b/sysutils/dvdisaster/files/pkg-message.in index 78d475d8d7cd..307a78eec957 100644 --- a/sysutils/dvdisaster/files/pkg-message.in +++ b/sysutils/dvdisaster/files/pkg-message.in @@ -1,12 +1,12 @@ [ { type: install message: <