diff options
| -rw-r--r-- | textproc/sowing/Makefile | 5 | ||||
| -rw-r--r-- | textproc/sowing/distinfo | 4 | ||||
| -rw-r--r-- | textproc/sowing/files/patch-Makefile.in | 16 | ||||
| -rw-r--r-- | textproc/sowing/files/patch-src_bfort_Makefile.in | 6 | ||||
| -rw-r--r-- | textproc/sowing/files/patch-src_sys_arch.c | 12 | ||||
| -rw-r--r-- | textproc/sowing/files/patch-src_tohtml_Makefile.in | 24 |
6 files changed, 26 insertions, 41 deletions
diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile index b303acf9efb3..9f0b6cfeb394 100644 --- a/textproc/sowing/Makefile +++ b/textproc/sowing/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sowing -PORTVERSION= 1.1.17 +PORTVERSION= 1.1.18 CATEGORIES= textproc MASTER_SITES= http://ftp.mcs.anl.gov/pub/sowing/ @@ -28,8 +28,7 @@ post-patch: .if defined(MAINTAINER_MODE) regression-test: install - @(cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} testing) + @(cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} testing) .endif .include <bsd.port.mk> diff --git a/textproc/sowing/distinfo b/textproc/sowing/distinfo index b77eaaa3f642..a7a10edb45e9 100644 --- a/textproc/sowing/distinfo +++ b/textproc/sowing/distinfo @@ -1,2 +1,2 @@ -SHA256 (sowing-1.1.17.tar.gz) = fb6d76c02c9691c8abe652498283ef5d260cb2ec4d0ec7afaa7623aaa7de8bb8 -SIZE (sowing-1.1.17.tar.gz) = 660384 +SHA256 (sowing-1.1.18.tar.gz) = b63cec263c413b18d283d8885ff38fe0c2267d8fc6b2246b8df922411cab1e13 +SIZE (sowing-1.1.18.tar.gz) = 560779 diff --git a/textproc/sowing/files/patch-Makefile.in b/textproc/sowing/files/patch-Makefile.in index da6ef32f7bf8..f7e81348f119 100644 --- a/textproc/sowing/files/patch-Makefile.in +++ b/textproc/sowing/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-02-06 18:40:19.000000000 +0100 -+++ Makefile.in 2008-04-06 14:31:07.000000000 +0200 -@@ -7,6 +7,7 @@ +--- 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@ @@ -8,7 +8,7 @@ INSTALL_DATA = @INSTALL_DATA@ SHELL = @SHELL@ top_srcdir=@top_srcdir@ -@@ -63,13 +64,13 @@ +@@ -64,13 +65,13 @@ install: @MKDIR@ $(man1dir) ; fi @if [ ! -d $(man1dir) ] ; then \ echo "Please create $(man1dir)" ; exit 1 ; fi @@ -25,11 +25,3 @@ 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 ;\ diff --git a/textproc/sowing/files/patch-src_bfort_Makefile.in b/textproc/sowing/files/patch-src_bfort_Makefile.in index b18325de43ae..374952314b6c 100644 --- a/textproc/sowing/files/patch-src_bfort_Makefile.in +++ b/textproc/sowing/files/patch-src_bfort_Makefile.in @@ -1,6 +1,6 @@ ---- ./src/bfort/Makefile.in.orig 2009-12-28 17:03:12.000000000 +0100 -+++ ./src/bfort/Makefile.in 2009-12-30 14:34:18.000000000 +0100 -@@ -4,15 +4,15 @@ +--- src/bfort/Makefile.in.orig 2014-11-30 15:59:58 UTC ++++ src/bfort/Makefile.in +@@ -4,15 +4,15 @@ SHELL = /bin/sh include ../../Makerules top_srcdir=@top_srcdir@ srcdir=@srcdir@ diff --git a/textproc/sowing/files/patch-src_sys_arch.c b/textproc/sowing/files/patch-src_sys_arch.c index 5a7f73e82b31..44aa44cd5cab 100644 --- a/textproc/sowing/files/patch-src_sys_arch.c +++ b/textproc/sowing/files/patch-src_sys_arch.c @@ -1,5 +1,5 @@ ---- src/sys/arch.c.orig Wed Sep 20 20:01:15 2000 -+++ src/sys/arch.c Fri Jul 6 23:08:27 2007 +--- 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 @@ -9,13 +9,13 @@ #undef HAS_UNAME #endif #if defined(sun4) && defined(sun4Pre41) -@@ -91,6 +91,9 @@ - +@@ -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 diff --git a/textproc/sowing/files/patch-src_tohtml_Makefile.in b/textproc/sowing/files/patch-src_tohtml_Makefile.in index eadcb75ca457..cecd7f4ea1bf 100644 --- a/textproc/sowing/files/patch-src_tohtml_Makefile.in +++ b/textproc/sowing/files/patch-src_tohtml_Makefile.in @@ -1,6 +1,6 @@ ---- ./src/tohtml/Makefile.in.orig 2009-12-28 17:03:12.000000000 +0100 -+++ ./src/tohtml/Makefile.in 2009-12-30 14:36:54.000000000 +0100 -@@ -4,14 +4,14 @@ +--- 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@ @@ -9,18 +9,12 @@ @VPATH@ LIBS = ../../lib/libsowing.a - INCLUDES = -I${top_srcdir}/include -I. -I../../include - DEFS = -DPSPATH='"@bindir@/"' \ -- -DBMSOURCE='"@datarootdir@/"' \ -- -DBASEDEF='"@datarootdir@/basedefs.txt"' -+ -DBMSOURCE='"@datadir@/"' \ -+ -DBASEDEF='"@datadir@/basedefs.txt"' - PROGRAMS = tohtml tortf +@@ -39,7 +39,7 @@ distclean: clean - BASEOBJS = search.o texactio.o rdaux.o rdindx.o label.o scan.o \ -@@ -40,4 +40,4 @@ install: $(INSTALL_PROGRAM) tohtml @bindir@/tohtml - $(INSTALL_PROGRAM) xwdsize @bindir@/xwdsize -- $(INSTALL_DATA) basedefs.txt @datarootdir@/basedefs.txt -+ $(INSTALL_DATA) basedefs.txt @datadir@/basedefs.txt +- $(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 |