Attachment #221402 for bug #252531

View | Details | Raw Unified | Return to bug 252531
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mtools	4	PORTNAME= mtools
5	PORTVERSION= 4.0.10	5	PORTVERSION= 4.0.26
6	PORTREVISION= 6	6	PORTREVISION= 0
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= GNU	8	MASTER_SITES= GNU
9		9

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mtools-4.0.10.tar.bz2) = 860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded	1	SHA256 (mtools-4.0.26.tar.bz2) = 539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a
2	SIZE (mtools-4.0.10.tar.bz2) = 381481	2	SIZE (mtools-4.0.26.tar.bz2) = 420648

Lines 77-83 Link Here

(-)files/patch-2 (-1 / +1 lines)
77	+mtools_lower_case=1	77	+mtools_lower_case=1
78	--- devices.c.orig Thu Oct 7 22:12:00 2004	78	--- devices.c.orig Thu Oct 7 22:12:00 2004
79	+++ devices.c Thu Oct 7 22:16:46 2004	79	+++ devices.c Thu Oct 7 22:16:46 2004
80	@@ -790,10 +790,10 @@	80	@@ -811,10 +811,10 @@
81	#ifdef OS_freebsd	81	#ifdef OS_freebsd
82	#define predefined_devices	82	#define predefined_devices
83	struct device devices[] = {	83	struct device devices[] = {




--- Makefile.in.orig
+++ Makefile.in
@@ -72,8 +72,11 @@
 .SUFFIXES: .o .c
 .SUFFIXES: .o .c
 

+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 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
+ifndef WITHOUT_X11
+MAN1 +=	floppyd.1 floppyd_installtest.1
+endif
 MAN1EXT	= 1
@@ -133,8 +136,8 @@
 MAN5	= mtools.5
@@ -132,7 +135,7 @@
 xdf_io.c mkmanifest.c
 
 

+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 mshortname \
 mshowfat mbadblocks mzip
@@ -278,11 +281,11 @@
 install-scripts: $(DESTDIR)$(bindir)/mtools
 	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	@for j in $(SCRIPTS) ; do \

 		echo $(DESTDIR)$(bindir)/$$j ; \
 	done
-	rm -f $(DESTDIR)$(bindir)/lz
-	cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
+	#rm -f $(DESTDIR)$(bindir)/lz
+	#cd $(DESTDIR)$(bindir) && $(LN_S) uz lz

 install-man:
 	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)




 	HOST_ID="$HOST_ID -DOS_$host_os3"
 fi
 
@@ -5726,38 +5726,38 @@
     fi	
     CFLAGS="$CFLAGS $Wall"
 else
-    if [ $host_os3 = hpux ] ; then

 	    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"

Return to bug 252531

Lines 1-6 Link Here

(-)files/patch-a (-11 / +9 lines)
1	--- Makefile.in.orig	1	--- Makefile.in.orig
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -72,10 +72,13 @@	3	@@ -72,8 +72,11 @@
4	.SUFFIXES: .o .c	4	.SUFFIXES: .o .c
5	.SUFFIXES: .o .c	5	.SUFFIXES: .o .c
6		6
Lines 8-21 Link Here
8	+MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \	8	+MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
9	mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 minfo.1 \	9	mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 minfo.1 \
10	mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \	10	mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
11	mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1	11	mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
12	+ifndef WITHOUT_X11	12	+ifndef WITHOUT_X11
13	+MAN1 += floppyd.1 floppyd_installtest.1	13	+MAN1 += floppyd.1 floppyd_installtest.1
14	+endif	14	+endif
15	MAN1EXT = 1	15	MAN1EXT = 1
16	MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT}	16	@@ -133,8 +136,8 @@
17	MAN5 = mtools.5
18	@@ -132,7 +135,7 @@
19	xdf_io.c mkmanifest.c	17	xdf_io.c mkmanifest.c
20		18
21		19
Lines 23-30 Link Here
23	+SCRIPTS = mcheck mxtar mcomp amuFormat.sh	21	+SCRIPTS = mcheck mxtar mcomp amuFormat.sh
24		22
25	LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \	23	LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \
26	mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \	24	mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshortname \
27	@@ -269,11 +272,11 @@	25	mshowfat mbadblocks mzip
		26	@@ -278,11 +281,11 @@
28	install-scripts: $(DESTDIR)$(bindir)/mtools	27	install-scripts: $(DESTDIR)$(bindir)/mtools
29	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)	28	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
30	@for j in $(SCRIPTS) ; do \	29	@for j in $(SCRIPTS) ; do \
Lines 33-41 Link Here
33	echo $(DESTDIR)$(bindir)/$$j ; \	32	echo $(DESTDIR)$(bindir)/$$j ; \
34	done	33	done
35	- rm -f $(DESTDIR)$(bindir)/lz	34	- rm -f $(DESTDIR)$(bindir)/lz
36	- $(LN_S) uz $(DESTDIR)$(bindir)/lz	35	- cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
37	+ #rm -f $(DESTDIR)$(bindir)/lz	36	+ #rm -f $(DESTDIR)$(bindir)/lz
38	+ #$(LN_S) uz $(DESTDIR)$(bindir)/lz	37	+ #cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
39		38
40	install-man:	39	install-man:
41	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)

Lines 13-20 Link Here

(-)files/patch-g (-8 / +1 lines)
13	HOST_ID="$HOST_ID -DOS_$host_os3"	13	HOST_ID="$HOST_ID -DOS_$host_os3"
14	fi	14	fi
15		15
16	@@ -2490,44 +2490,44 @@	16	@@ -5726,38 +5726,38 @@
17	fi
18	CFLAGS="$CFLAGS $Wall"	17	CFLAGS="$CFLAGS $Wall"
19	else	18	else
20	- if [ $host_os3 = hpux ] ; then	19	- if [ $host_os3 = hpux ] ; then
Lines 33-44 Link Here
33	LDFLAGS="$LDFLAGS -z"	32	LDFLAGS="$LDFLAGS -z"
34	fi	33	fi
35		34
36
37	-if [ $host_vendor = linux ] ; then
38	+if [ "$host_vendor" = linux ] ; then
39	LDFLAGS="$LDFLAGS -z"
40	fi
41
42	-if [ $host_os3 = xenix ] ; then	35	-if [ $host_os3 = xenix ] ; then
43	+if [ "$host_os3" = xenix ] ; then	36	+if [ "$host_os3" = xenix ] ; then
44	LDFLAGS="$LDFLAGS -M2e -i -f 5000"	37	LDFLAGS="$LDFLAGS -M2e -i -f 5000"