Attachment 221402 Details for Bug 252531 – proposed patch

[patch] proposed patch

mtools-4.0.26.diff (text/plain), 3.42 KB, created by Mara Sophie Grosch on 2021-01-08 19:32:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mara Sophie Grosch

Created: 2021-01-08 19:32:42 UTC

Size: 3.42 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 560804)
>+++ Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	mtools
>-PORTVERSION=	4.0.10
>-PORTREVISION=	6
>+PORTVERSION=	4.0.26
>+PORTREVISION=	0
> CATEGORIES=	emulators
> MASTER_SITES=	GNU
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 560804)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mtools-4.0.10.tar.bz2) = 860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded
>-SIZE (mtools-4.0.10.tar.bz2) = 381481
>+SHA256 (mtools-4.0.26.tar.bz2) = 539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a
>+SIZE (mtools-4.0.26.tar.bz2) = 420648
>Index: files/patch-2
>===================================================================
>--- files/patch-2	(revision 560804)
>+++ files/patch-2	(working copy)
>@@ -77,7 +77,7 @@
> +mtools_lower_case=1
> --- devices.c.orig	Thu Oct  7 22:12:00 2004
> +++ devices.c	Thu Oct  7 22:16:46 2004
>-@@ -790,10 +790,10 @@
>+@@ -811,10 +811,10 @@
>  #ifdef OS_freebsd
>  #define predefined_devices
>  struct device devices[] = {
>Index: files/patch-a
>===================================================================
>--- files/patch-a	(revision 560804)
>+++ files/patch-a	(working copy)
>@@ -1,6 +1,6 @@
> --- Makefile.in.orig
> +++ Makefile.in
>-@@ -72,10 +72,13 @@
>+@@ -72,8 +72,11 @@
>  .SUFFIXES: .o .c
>  .SUFFIXES: .o .c
>  
>@@ -8,14 +8,12 @@
> +MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
>  mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
>  mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
>- mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
>+ mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
> +ifndef WITHOUT_X11
> +MAN1 +=	floppyd.1 floppyd_installtest.1
> +endif
>  MAN1EXT	= 1
>- MAN1DIR	= $(DESTDIR)$(mandir)/man${MAN1EXT}
>- MAN5	= mtools.5
>-@@ -132,7 +135,7 @@
>+@@ -133,8 +136,8 @@
>  xdf_io.c mkmanifest.c
>  
>  
>@@ -23,8 +21,9 @@
> +SCRIPTS = mcheck mxtar mcomp amuFormat.sh
>  
>  LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \
>- mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \
>-@@ -269,11 +272,11 @@
>+ mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshortname \
>+ mshowfat mbadblocks mzip
>+@@ -278,11 +281,11 @@
>  install-scripts: $(DESTDIR)$(bindir)/mtools
>  	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
>  	@for j in $(SCRIPTS) ; do \
>@@ -33,9 +32,8 @@
>  		echo $(DESTDIR)$(bindir)/$$j ; \
>  	done
> -	rm -f $(DESTDIR)$(bindir)/lz
>--	$(LN_S) uz $(DESTDIR)$(bindir)/lz
>+-	cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
> +	#rm -f $(DESTDIR)$(bindir)/lz
>-+	#$(LN_S) uz $(DESTDIR)$(bindir)/lz
>- 
>++	#cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
>+
>  install-man:
>- 	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
>Index: files/patch-g
>===================================================================
>--- files/patch-g	(revision 560804)
>+++ files/patch-g	(working copy)
>@@ -13,8 +13,7 @@
>  	HOST_ID="$HOST_ID -DOS_$host_os3"
>  fi
>  
>-@@ -2490,44 +2490,44 @@
>-     fi	
>+@@ -5726,38 +5726,38 @@
>      CFLAGS="$CFLAGS $Wall"
>  else
> -    if [ $host_os3 = hpux ] ; then
>@@ -33,12 +32,6 @@
>  	    LDFLAGS="$LDFLAGS -z"
>  fi
>  
>- 
>--if [ $host_vendor = linux ] ; then
>-+if [ "$host_vendor" = linux ] ; then
>-     LDFLAGS="$LDFLAGS -z"
>- fi
>- 
> -if [ $host_os3 = xenix ] ; then
> +if [ "$host_os3" = xenix ] ; then
>      LDFLAGS="$LDFLAGS -M2e -i -f 5000"

Actions: View | Diff

Attachments on bug 252531: 221402