From owner-svn-ports-all@FreeBSD.ORG Sat Jan 24 16:43:56 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 404D8406; Sat, 24 Jan 2015 16:43:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BC063B8; Sat, 24 Jan 2015 16:43:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0OGhuiG065722; Sat, 24 Jan 2015 16:43:56 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0OGht3r065715; Sat, 24 Jan 2015 16:43:55 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201501241643.t0OGht3r065715@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Sat, 24 Jan 2015 16:43:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377801 - in head/lang/snobol4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jan 2015 16:43:56 -0000 Author: johans Date: Sat Jan 24 16:43:54 2015 New Revision: 377801 URL: https://svnweb.freebsd.org/changeset/ports/377801 QAT: https://qat.redports.org/buildarchive/r377801/ Log: - Update to csnobol4 version 2.0; this is a major upgrade http://www.snobol4.org/csnobol4/curr/CHANGES - Added some patches to work around broken build dependencies Added: head/lang/snobol4/files/ head/lang/snobol4/files/patch-Makefile2.m4 (contents, props changed) Modified: head/lang/snobol4/Makefile head/lang/snobol4/distinfo head/lang/snobol4/pkg-plist Modified: head/lang/snobol4/Makefile ============================================================================== --- head/lang/snobol4/Makefile Sat Jan 24 16:40:38 2015 (r377800) +++ head/lang/snobol4/Makefile Sat Jan 24 16:43:54 2015 (r377801) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= snobol4 -PORTVERSION= 1.5 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= lang MASTER_SITES= ftp://ftp.ultimate.com/snobol/ @@ -13,14 +12,22 @@ COMMENT= Port of Macro SNOBOL4, supports HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --snolibdir=${PREFIX}/lib/${PORTNAME} +CONFIGURE_ENV+= DL_EXT=".so" USES= gmake PLIST_SUB+= VERSION=${PORTVERSION} +ALL_TARGET= xsnobol4 + +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} +PORTDOCS= * post-patch: @${REINPLACE_CMD} 's:[^=]*\.tmp$$:${WRKSRC}/&:' ${WRKSRC}/configure - -post-install: - ${LN} -sf sdb-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/sdb - ${LN} -sf snobol4-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/snobol4 + @${REINPLACE_CMD} '/grep/s/$$/| egrep -v "built-in|command line"/' \ + ${WRKSRC}/cc-M + @${REINPLACE_CMD} 's:../snobol4:../xsnobol4:' \ + ${WRKSRC}/doc/Makefile ${WRKSRC}/modules/*/Makefile + @${REINPLACE_CMD} -e 's::${PREFIX}/bin:' \ + -e 's::${PREFIX}/lib/${PORTNAME}:' \ + ${WRKSRC}/snopea.in ${WRKSRC}/sdb.sh .include Modified: head/lang/snobol4/distinfo ============================================================================== --- head/lang/snobol4/distinfo Sat Jan 24 16:40:38 2015 (r377800) +++ head/lang/snobol4/distinfo Sat Jan 24 16:43:54 2015 (r377801) @@ -1,2 +1,2 @@ -SHA256 (snobol4-1.5.tar.gz) = 9f7ec649f2d700a30091af3bbd68db90b916d728200f915b1ba522bcfd0d7abd -SIZE (snobol4-1.5.tar.gz) = 921282 +SHA256 (snobol4-2.0.tar.gz) = 94ae7af4fcaa9139954c6d530ca91f25ffd7a69ff45f1ba52b52095bbdf6631f +SIZE (snobol4-2.0.tar.gz) = 903436 Added: head/lang/snobol4/files/patch-Makefile2.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/snobol4/files/patch-Makefile2.m4 Sat Jan 24 16:43:54 2015 (r377801) @@ -0,0 +1,54 @@ +--- Makefile2.m4.orig 2014-12-31 08:04:21.000000000 +0100 ++++ Makefile2.m4 2015-01-24 16:39:40.000000000 +0100 +@@ -614,8 +614,8 @@ snopea.1: snopea snolib/snopea.sno snobo + snopea.1.html: snopea snolib/snopea.sno snobol4 + $(SNOPEA) snopea snopea.1.html + +-$(GENERATED_DOCS_DOCDIR): snopea snolib/snopea.sno snobol4 +- cd doc; make ++$(GENERATED_DOCS_DOCDIR): snopea snolib/snopea.sno xsnobol4 ++ cd doc; $(MAKE) + + ################# + # installation +@@ -628,17 +628,18 @@ INSTALL_H=[include]/h.h [include]/snotyp + # generated SNOLIB files (host.sno generated at top level) + GENSNOLIB=host.sno config.sno + +-SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) $(MODULES_INCLUDE) ++SNOLIB_FILES=snolib/*.sno $(GENSNOLIB) + +-install: snobol4 sdb timing.out $(GENERATED_DOCS) ++install: xsnobol4 sdb $(GENERATED_DOCS) ++ cp xsnobol4$(EXT) snobol4$(EXT) + $(INSTALL) -d $(BINDIR) + $(INSTALL) $(INSTALL_BIN_FLAGS) snobol4 $(BINDIR)/snobol4-$(VERS) + $(INSTALL) sdb $(BINDIR)/sdb-$(VERS) + $(INSTALL) snopea $(BINDIR)/snopea-$(VERS) + rm -f $(BINDIR)/snobol4 $(BINDIR)/sdb $(BINDIR)/snopea +- ln -s $(BINDIR)/snobol4-$(VERS) $(BINDIR)/snobol4 +- ln -s $(BINDIR)/sdb-$(VERS) $(BINDIR)/sdb +- ln -s $(BINDIR)/snopea-$(VERS) $(BINDIR)/snopea ++ cd $(BINDIR) && ln -s snobol4-$(VERS) snobol4 ++ cd $(BINDIR) && ln -s sdb-$(VERS) sdb ++ cd $(BINDIR) && ln -s snopea-$(VERS) snopea + $(INSTALL) -d $(MAN1DIR) + for F in $(GENERATED_DOCS_DOCDIR1); do \ + $(INSTALL) -m 644 $$F $(MAN1DIR); \ +@@ -664,15 +665,12 @@ install: snobol4 sdb timing.out $(GENERA + for F in $(SNOLIB_FILES); do \ + $(INSTALL) -m 644 $$F $(SNOLIB_LIB); \ + done +- for M in $(MODULES); do \ +- (cd modules/$$M; $(RUNSETUP) install); \ +- done + $(INSTALL) -d $(INCLUDE_DIR) + for F in $(INSTALL_H); do \ + $(INSTALL) -m 644 $$F $(INCLUDE_DIR); \ + done + $(INSTALL) -d $(DOC_DIR) +- for F in doc/load.txt doc/*.html modules/*/*.html; do \ ++ for F in doc/load.txt doc/*.html; do \ + $(INSTALL) -m 644 $$F $(DOC_DIR); \ + done + ifdef([INSTALL_SYSDEP], INSTALL_SYSDEP Modified: head/lang/snobol4/pkg-plist ============================================================================== --- head/lang/snobol4/pkg-plist Sat Jan 24 16:40:38 2015 (r377800) +++ head/lang/snobol4/pkg-plist Sat Jan 24 16:43:54 2015 (r377801) @@ -2,47 +2,57 @@ bin/sdb bin/sdb-%%VERSION%% bin/snobol4 bin/snobol4-%%VERSION%% -man/man1/sdb.1.gz -man/man1/snobol4.1.gz -man/man3/snobol4dbm.3.gz -man/man3/snobol4random.3.gz -man/man3/snobol4readline.3.gz -man/man3/snobol4tcl.3.gz -man/man3/snobol4time.3.gz -man/man3/snolib.3.gz +bin/snopea +bin/snopea-%%VERSION%% lib/snobol4/%%VERSION%%/CHANGES lib/snobol4/%%VERSION%%/README lib/snobol4/%%VERSION%%/include/config.h lib/snobol4/%%VERSION%%/include/dt.h lib/snobol4/%%VERSION%%/include/equ.h lib/snobol4/%%VERSION%%/include/h.h +lib/snobol4/%%VERSION%%/include/handle.h lib/snobol4/%%VERSION%%/include/load.h lib/snobol4/%%VERSION%%/include/macros.h lib/snobol4/%%VERSION%%/include/snotypes.h +lib/snobol4/%%VERSION%%/include/str.h lib/snobol4/%%VERSION%%/include/version.h +lib/snobol4/%%VERSION%%/lib/basename.sno lib/snobol4/%%VERSION%%/lib/bq.sno lib/snobol4/%%VERSION%%/lib/chars.sno +lib/snobol4/%%VERSION%%/lib/config.sno lib/snobol4/%%VERSION%%/lib/dynamic.sno lib/snobol4/%%VERSION%%/lib/fence.sno lib/snobol4/%%VERSION%%/lib/file.sno lib/snobol4/%%VERSION%%/lib/ftp.sno lib/snobol4/%%VERSION%%/lib/host.sno lib/snobol4/%%VERSION%%/lib/http.sno -lib/snobol4/%%VERSION%%/lib/logic.sno -lib/snobol4/%%VERSION%%/lib/ndbm.sno lib/snobol4/%%VERSION%%/lib/not.sno -lib/snobol4/%%VERSION%%/lib/random.sno -lib/snobol4/%%VERSION%%/lib/readline.sno +lib/snobol4/%%VERSION%%/lib/repl.sno lib/snobol4/%%VERSION%%/lib/sdb.sno lib/snobol4/%%VERSION%%/lib/serv.sno +lib/snobol4/%%VERSION%%/lib/setuputil.sno lib/snobol4/%%VERSION%%/lib/smtp.sno lib/snobol4/%%VERSION%%/lib/snobol4+.sno +lib/snobol4/%%VERSION%%/lib/snopea.sno lib/snobol4/%%VERSION%%/lib/spitbol.sno -lib/snobol4/%%VERSION%%/lib/stcl.sno lib/snobol4/%%VERSION%%/lib/tcp.sno -lib/snobol4/%%VERSION%%/lib/time.sno lib/snobol4/%%VERSION%%/lib/unique.sno lib/snobol4/%%VERSION%%/lib/url.sno lib/snobol4/%%VERSION%%/lib/utf.sno lib/snobol4/%%VERSION%%/lib/wrapper.sno -lib/snobol4/%%VERSION%%/load.txt +man/man1/sdb.1.gz +man/man1/snobol4.1.gz +man/man1/snobol4blocks.1.gz +man/man1/snobol4cmd.1.gz +man/man1/snobol4ctrl.1.gz +man/man1/snobol4error.1.gz +man/man1/snobol4ext.1.gz +man/man1/snobol4func.1.gz +man/man1/snobol4io.1.gz +man/man1/snobol4key.1.gz +man/man1/snopea.1.gz +man/man3/snobol4setup.3.gz +man/man3/snolib.3.gz +man/man7/snopea.7.gz +@dir lib/snobol4/%%VERSION%%/lib/shared +@dir lib/snobol4/local/shared