Attachment #159190 for bug #201852

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

Lines 2-8 Link Here

(-)textproc/sowing/Makefile (-3 / +2 lines)
2	# $FreeBSD: head/textproc/sowing/Makefile 392322 2015-07-16 20:53:28Z kwm $	2	# $FreeBSD: head/textproc/sowing/Makefile 392322 2015-07-16 20:53:28Z kwm $
3		3
4	PORTNAME= sowing	4	PORTNAME= sowing
5	PORTVERSION= 1.1.17	5	PORTVERSION= 1.1.18
6	CATEGORIES= textproc	6	CATEGORIES= textproc
7	MASTER_SITES= http://ftp.mcs.anl.gov/pub/sowing/	7	MASTER_SITES= http://ftp.mcs.anl.gov/pub/sowing/
8		8
Lines 28-35 Link Here
28		28
29	.if defined(MAINTAINER_MODE)	29	.if defined(MAINTAINER_MODE)
30	regression-test: install	30	regression-test: install
31	@(cd ${BUILD_WRKSRC}; \	31	@(cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} testing)
32	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} testing)
33	.endif	32	.endif
34		33
35	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)textproc/sowing/distinfo (-2 / +2 lines)
1	SHA256 (sowing-1.1.17.tar.gz) = fb6d76c02c9691c8abe652498283ef5d260cb2ec4d0ec7afaa7623aaa7de8bb8	1	SHA256 (sowing-1.1.18.tar.gz) = b63cec263c413b18d283d8885ff38fe0c2267d8fc6b2246b8df922411cab1e13
2	SIZE (sowing-1.1.17.tar.gz) = 660384	2	SIZE (sowing-1.1.18.tar.gz) = 560779




--- Makefile.in.orig	2015-07-06 18:37:03 UTC
+++ Makefile.in
@@ -8,6 +8,7 @@ datadir     = @datadir@
 man1dir     = @mandir@/man1
 INSTALL     = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_DATA    = @INSTALL_DATA@
 SHELL = @SHELL@
 top_srcdir=@top_srcdir@
@@ -64,13 +65,13 @@ install:
 	    @MKDIR@ $(man1dir) ; fi
 	@if [ ! -d $(man1dir) ] ; then \
 	    echo "Please create $(man1dir)" ; exit 1 ; fi

 	fi
 	$(INSTALL_PROGRAM) src/bfort/bfort $(bindir)/bfort
 	$(INSTALL_PROGRAM) src/mapnames/mapnames $(bindir)/mapnames
@@ -91,6 +92,7 @@
 	    $(INSTALL_DATA)    ${top_srcdir}/share/refman.sty $(datadir)/refman.sty ;\
 	    $(INSTALL_DATA)    ${top_srcdir}/share/doctext/html.def $(datadir)/doctext/html.def ;\
 	    $(INSTALL_DATA)    ${top_srcdir}/share/doctext/htmltabl.def $(datadir)/doctext/htmltabl.def ;\
+	    $(INSTALL_DATA)    ${top_srcdir}/share/doctext/htmlcolor.def $(datadir)/doctext/htmlcolor.def ;\
 	    $(INSTALL_DATA)    ${top_srcdir}/share/doctext/htmlargtbl.def $(datadir)/doctext/htmlargtbl.def ;\
 	    $(INSTALL_DATA)    ${top_srcdir}/share/doctext/latex.def $(datadir)/doctext/latex.def ;\
 	    $(INSTALL_DATA)    ${top_srcdir}/share/doctext/latexargtbl.def $(datadir)/doctext/latexargtbl.def ;\

Lines 1-6 Link Here

(-)textproc/sowing/files/patch-src_bfort_Makefile.in (-3 / +3 lines)
1	--- ./src/bfort/Makefile.in.orig 2009-12-28 17:03:12.000000000 +0100	1	--- src/bfort/Makefile.in.orig 2014-11-30 15:59:58 UTC
2	+++ ./src/bfort/Makefile.in 2009-12-30 14:34:18.000000000 +0100	2	+++ src/bfort/Makefile.in
3	@@ -4,15 +4,15 @@	3	@@ -4,15 +4,15 @@ SHELL = /bin/sh
4	include ../../Makerules	4	include ../../Makerules
5	top_srcdir=@top_srcdir@	5	top_srcdir=@top_srcdir@
6	srcdir=@srcdir@	6	srcdir=@srcdir@




--- src/sys/arch.c.orig	2009-12-29 16:53:02 UTC
+++ src/sys/arch.c
@@ -11,7 +11,7 @@
     defined(NeXT)  || defined(WIN32)
 #undef HAS_UNAME

 #undef HAS_UNAME
 #endif
 #if defined(sun4) && defined(sun4Pre41)
@@ -96,6 +96,9 @@ void SYGetArchType( char *str, int slen 
 
 #elif defined(NeXT)
     strncpy( str, "NeXT", slen );
 
+#elif defined(__FreeBSD__)
+    strncpy( str, "FreeBSD", slen );
+
 #else
     strncpy( str, "Unknown", slen );
 #endif




--- src/tohtml/Makefile.in.orig	2015-07-06 18:26:48 UTC
+++ src/tohtml/Makefile.in
@@ -6,7 +6,7 @@ INSTALL_DATA    = @INSTALL_DATA@
 include ../../Makerules
 top_srcdir=@top_srcdir@
 srcdir=@srcdir@

 @VPATH@
 
 LIBS      =  ../../lib/libsowing.a
@@ -39,7 +39,7 @@ distclean: clean
 DEFS      =   -DPSPATH='"@bindir@/"' \
-              -DBMSOURCE='"@datarootdir@/"' \
-	      -DBASEDEF='"@datarootdir@/basedefs.txt"'
+              -DBMSOURCE='"@datadir@/"' \
+	      -DBASEDEF='"@datadir@/basedefs.txt"'
 PROGRAMS = tohtml tortf 
 
 BASEOBJS = search.o texactio.o rdaux.o rdindx.o label.o scan.o \
@@ -40,4 +40,4 @@
 install:
 	$(INSTALL_PROGRAM) tohtml @bindir@/tohtml
-	$(INSTALL_DATA) ../../share/basedefs.txt @datarootdir@/basedefs.txt
+	$(INSTALL_DATA) ../../share/basedefs.txt @datadir@/basedefs.txt
 
 # We no longer need this program, which is good because X11 is getting
 # harder to find

Return to bug 201852

Lines 1-6 Link Here

(-)textproc/sowing/files/patch-Makefile.in (-12 / +4 lines)
1	--- Makefile.in.orig 2008-02-06 18:40:19.000000000 +0100	1	--- Makefile.in.orig 2015-07-06 18:37:03 UTC
2	+++ Makefile.in 2008-04-06 14:31:07.000000000 +0200	2	+++ Makefile.in
3	@@ -7,6 +7,7 @@	3	@@ -8,6 +8,7 @@ datadir = @datadir@
4	man1dir = @mandir@/man1	4	man1dir = @mandir@/man1
5	INSTALL = @INSTALL@	5	INSTALL = @INSTALL@
6	INSTALL_PROGRAM = @INSTALL_PROGRAM@	6	INSTALL_PROGRAM = @INSTALL_PROGRAM@
Lines 8-14 Link Here
8	INSTALL_DATA = @INSTALL_DATA@	8	INSTALL_DATA = @INSTALL_DATA@
9	SHELL = @SHELL@	9	SHELL = @SHELL@
10	top_srcdir=@top_srcdir@	10	top_srcdir=@top_srcdir@
11	@@ -63,13 +64,13 @@	11	@@ -64,13 +65,13 @@ install:
12	@MKDIR@ $(man1dir) ; fi	12	@MKDIR@ $(man1dir) ; fi
13	@if [ ! -d $(man1dir) ] ; then \	13	@if [ ! -d $(man1dir) ] ; then \
14	echo "Please create $(man1dir)" ; exit 1 ; fi	14	echo "Please create $(man1dir)" ; exit 1 ; fi
Lines 25-35 Link Here
25	fi	25	fi
26	$(INSTALL_PROGRAM) src/bfort/bfort $(bindir)/bfort	26	$(INSTALL_PROGRAM) src/bfort/bfort $(bindir)/bfort
27	$(INSTALL_PROGRAM) src/mapnames/mapnames $(bindir)/mapnames	27	$(INSTALL_PROGRAM) src/mapnames/mapnames $(bindir)/mapnames
28	@@ -91,6 +92,7 @@
29	$(INSTALL_DATA) ${top_srcdir}/share/refman.sty $(datadir)/refman.sty ;\
30	$(INSTALL_DATA) ${top_srcdir}/share/doctext/html.def $(datadir)/doctext/html.def ;\
31	$(INSTALL_DATA) ${top_srcdir}/share/doctext/htmltabl.def $(datadir)/doctext/htmltabl.def ;\
32	+ $(INSTALL_DATA) ${top_srcdir}/share/doctext/htmlcolor.def $(datadir)/doctext/htmlcolor.def ;\
33	$(INSTALL_DATA) ${top_srcdir}/share/doctext/htmlargtbl.def $(datadir)/doctext/htmlargtbl.def ;\
34	$(INSTALL_DATA) ${top_srcdir}/share/doctext/latex.def $(datadir)/doctext/latex.def ;\
35	$(INSTALL_DATA) ${top_srcdir}/share/doctext/latexargtbl.def $(datadir)/doctext/latexargtbl.def ;\

Lines 1-5 Link Here

(-)textproc/sowing/files/patch-src_sys_arch.c (-6 / +6 lines)
1	--- src/sys/arch.c.orig Wed Sep 20 20:01:15 2000	1	--- src/sys/arch.c.orig 2009-12-29 16:53:02 UTC
2	+++ src/sys/arch.c Fri Jul 6 23:08:27 2007	2	+++ src/sys/arch.c
3	@@ -11,7 +11,7 @@	3	@@ -11,7 +11,7 @@
4	defined(NeXT) \|\| defined(WIN32)	4	defined(NeXT) \|\| defined(WIN32)
5	#undef HAS_UNAME	5	#undef HAS_UNAME
Lines 9-21 Link Here
9	#undef HAS_UNAME	9	#undef HAS_UNAME
10	#endif	10	#endif
11	#if defined(sun4) && defined(sun4Pre41)	11	#if defined(sun4) && defined(sun4Pre41)
12	@@ -91,6 +91,9 @@	12	@@ -96,6 +96,9 @@ void SYGetArchType( char *str, int slen
13
14	#elif defined(NeXT)	13	#elif defined(NeXT)
15	strncpy( str, "NeXT", slen );	14	strncpy( str, "NeXT", slen );
16	+	15
17	+#elif defined(__FreeBSD__)	16	+#elif defined(__FreeBSD__)
18	+ strncpy( str, "FreeBSD", slen );	17	+ strncpy( str, "FreeBSD", slen );
19		18	+
20	#else	19	#else
21	strncpy( str, "Unknown", slen );	20	strncpy( str, "Unknown", slen );
		21	#endif

Lines 1-6 Link Here

(-)textproc/sowing/files/patch-src_tohtml_Makefile.in (-15 / +9 lines)
1	--- ./src/tohtml/Makefile.in.orig 2009-12-28 17:03:12.000000000 +0100	1	--- src/tohtml/Makefile.in.orig 2015-07-06 18:26:48 UTC
2	+++ ./src/tohtml/Makefile.in 2009-12-30 14:36:54.000000000 +0100	2	+++ src/tohtml/Makefile.in
3	@@ -4,14 +4,14 @@	3	@@ -6,7 +6,7 @@ INSTALL_DATA = @INSTALL_DATA@
4	include ../../Makerules	4	include ../../Makerules
5	top_srcdir=@top_srcdir@	5	top_srcdir=@top_srcdir@
6	srcdir=@srcdir@	6	srcdir=@srcdir@
Lines 9-26 Link Here
9	@VPATH@	9	@VPATH@
10		10
11	LIBS = ../../lib/libsowing.a	11	LIBS = ../../lib/libsowing.a
12	INCLUDES = -I${top_srcdir}/include -I. -I../../include	12	@@ -39,7 +39,7 @@ distclean: clean
13	DEFS = -DPSPATH='"@bindir@/"' \
14	- -DBMSOURCE='"@datarootdir@/"' \
15	- -DBASEDEF='"@datarootdir@/basedefs.txt"'
16	+ -DBMSOURCE='"@datadir@/"' \
17	+ -DBASEDEF='"@datadir@/basedefs.txt"'
18	PROGRAMS = tohtml tortf
19		13
20	BASEOBJS = search.o texactio.o rdaux.o rdindx.o label.o scan.o \
21	@@ -40,4 +40,4 @@
22	install:	14	install:
23	$(INSTALL_PROGRAM) tohtml @bindir@/tohtml	15	$(INSTALL_PROGRAM) tohtml @bindir@/tohtml
24	$(INSTALL_PROGRAM) xwdsize @bindir@/xwdsize	16	- $(INSTALL_DATA) ../../share/basedefs.txt @datarootdir@/basedefs.txt
25	- $(INSTALL_DATA) basedefs.txt @datarootdir@/basedefs.txt	17	+ $(INSTALL_DATA) ../../share/basedefs.txt @datadir@/basedefs.txt
26	+ $(INSTALL_DATA) basedefs.txt @datadir@/basedefs.txt	18
		19	# We no longer need this program, which is good because X11 is getting
		20	# harder to find