Date: Thu, 7 Apr 2005 15:09:30 +1000 (EST) From: Sam Lawrance <boris@brooknet.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79615: [PATCH] lang/scriba: update to 20b0 Message-ID: <20050407050930.658F3917@localhost> Resent-Message-ID: <200504070510.j375A3vV067340@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79615 >Category: ports >Synopsis: [PATCH] lang/scriba: update to 20b0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Apr 07 05:10:03 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Sam Lawrance >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD dirk.no.domain 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #11: Sun Mar 6 12:44:50 EST >Description: - Update to 20b0 - Files to be removed files/patch-aa files/patch-ab files/patch-ac files/patch-ad files/patch-af files/patch-ae files/patch-ag files/patch-cftc.c - Files to be added patch-commands::environ.c patch-extensions::bdb::interface.c patch-extensions::curl::interface.c patch-extensions::curses::interface.c patch-extensions::psql::interface.c patch-extensions::re::regex.h patch-make_gcc.jim patch-memory.c patch-scriba.c patch-setup.pl - Ewww, BASIC! >How-To-Repeat: >Fix: --- scriba-20b0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/FreeBSD/ports/lang/scriba/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 30 Jan 2005 14:37:32 -0000 1.11 +++ Makefile 7 Apr 2005 05:00:14 -0000 @@ -6,50 +6,139 @@ # PORTNAME= scriba -PORTVERSION= 10b21 -PORTREVISION= 1 +PORTVERSION= 20b0 CATEGORIES= lang MASTER_SITES= http://www.scriptbasic.com/download/ -DISTNAME= ${PORTNAME}-v${PORTVERSION} -# the filename of the current version has been re-styled as follows; -# however, as of November 2003, the patches do not apply cleanly, so -# this port needs further work. -#PORTVERSION= 1.0b30 -#DISTNAME= ${PORTNAME}-v${PORTVERSION}-source +DISTNAME= ${PORTNAME}-v2.0b0-source MAINTAINER= ports@FreeBSD.org COMMENT= A scripting implementation of the BASIC language -PRFXFILES= variations/standard/basiccmd.c \ - variations/standalone/basicc.c \ - configurer.c scriba.c scriba.conf.unix.lsp \ - testconf.c - +USE_REINPLACE= yes NO_WRKSUBDIR= yes USE_PERL5= yes CFLAGS+= -fPIC -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" +PORTDOCS= * + +# Extensions that depend on external libs default to off + +OPTIONS= BDB "Berkeley DB extension" off \ + CURL "CURL extension" off \ + GD "gd extension" off \ + MYSQL "MySQL extension (3.2.3 only)" off \ + ODBC "ODBC extension" off \ + PGSQL "PostgreSQL extension" off \ + XML "libxml2 extension" off + +.include <bsd.port.pre.mk> + +# Dependencies for port options + +.if defined(WITH_BDB) +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +PLIST_SUB+= BDB="" +.else +PLIST_SUB+= BDB="@comment " +.endif + +.if defined(WITH_CURL) +LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +PLIST_SUB+= CURL="" +.else +PLIST_SUB+= CURL="@comment " +.endif + +.if defined(WITH_GD) +LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +PLIST_SUB+= GD="" +.else +PLIST_SUB+= GD="@comment " +.endif + +.if defined(WITH_MYSQL) +LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +PLIST_SUB+= MYSQL="" +.else +PLIST_SUB+= MYSQL="@comment " +.endif + +.if defined(WITH_ODBC) +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +PLIST_SUB+= ODBC="" +.else +PLIST_SUB+= ODBC="@comment " +.endif + +.if defined(WITH_PGSQL) +USE_PGSQL= yes +PLIST_SUB+= PGSQL="" +.else +PLIST_SUB+= PGSQL="@comment " +.endif + +.if defined(WITH_XML) +LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 +PLIST_SUB+= XML="" +.else +PLIST_SUB+= XML="@comment " +.endif post-patch: -.for P in ${PRFXFILES} - @(cd ${WRKSRC} && ${SED} -e 's,%%PREFIX%%,${PREFIX},g' $P > foo && \ - ${MV} foo $P) -.endfor + # Put esd.pm in a directory where perl will find it + cd ${WRKSRC} && ${MKDIR} jamal && ${CP} esd.pm jamal + ${GREP} -Rl '^#!.*bin/perl' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -e 's,^#!.*bin/perl,#!${PERL},' + ${REINPLACE_CMD} \ + -e 's,%%PREFIX%%,${PREFIX},g' \ + -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ + -e 's,%%X11BASE%%,${X11BASE},g' \ + -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ + -e 's,%%DATADIR%%,${DATADIR},g' \ + -e 's,%%CC%%,${CC},g' \ + -e 's,%%CFLAGS%%,${CFLAGS},g' \ + -e 's,%%LDFLAGS%%,${LDFLAGS},g' \ + -e 's,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g' \ + -e 's,root:root,root:wheel,g' \ + ${WRKSRC}/setup.pl ${WRKSRC}/scriba.c ${WRKSRC}/make_gcc.jim + +# Remove extensions not selected as options + +.if !defined(WITH_BDB) + @${RM} -rf ${WRKSRC}/extensions/bdb +.endif + +.if !defined(WITH_CURL) + @${RM} -rf ${WRKSRC}/extensions/curl +.endif + +.if !defined(WITH_GD) + @${RM} -rf ${WRKSRC}/extensions/gd +.endif + +.if !defined(WITH_MYSQL) + @${RM} -rf ${WRKSRC}/extensions/mysql +.endif + +.if !defined(WITH_ODBC) + @${RM} -rf ${WRKSRC}/extensions/odbc +.endif + +.if !defined(WITH_PGSQL) + @${RM} -rf ${WRKSRC}/extensions/psql +.endif + +.if !defined(WITH_XML) + @${RM} -rf ${WRKSRC}/extensions/xml +.endif + +do-build: +# -I allows script to include the Jamal preprocessor + cd ${WRKSRC} && export PERL5OPT='-I${WRKSRC}' && \ + ${PERL} setup.pl --unix do-install: - ${MKDIR} ${PREFIX}/etc/scriba - ${MKDIR} ${PREFIX}/include/scriba - ${MKDIR} ${PREFIX}/lib/scriba - ${CHMOD} 1666 ${PREFIX}/lib/scriba - ${INSTALL_PROGRAM} ${WRKSRC}/scriba ${PREFIX}/bin -.for M in cgi hash re - ${INSTALL_PROGRAM} ${WRKSRC}/$M.so ${PREFIX}/lib/scriba -.endfor -.for I in bdb cgi error gd hash heb md5 mysql re test time trial zlib ../heber - ${INSTALL_DATA} ${WRKSRC}/include/$I.bas ${PREFIX}/include/scriba -.endfor - ${INSTALL_DATA} ${WRKSRC}/basicc.a ${PREFIX}/lib/scriba - ${WRKSRC}/cftc ${WRKSRC}/scriba.conf.unix.lsp \ - ${PREFIX}/etc/scriba/basic.conf + cd ${WRKSRC} && \ + ${PERL} setup.pl --unix --no-install-interactive --install && \ + ${SH} install.sh -.include <bsd.port.mk> +.include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/FreeBSD/ports/lang/scriba/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 29 Jan 2004 07:24:47 -0000 1.2 +++ distinfo 26 Feb 2005 07:55:19 -0000 @@ -1,2 +1,2 @@ -MD5 (scriba-v10b21.tar.gz) = d4098436120d030dead170804b8d2f03 -SIZE (scriba-v10b21.tar.gz) = 673549 +MD5 (scriba-v2.0b0-source.tar.gz) = c3cf4d8af5e4a3af46180c8237805ee2 +SIZE (scriba-v2.0b0-source.tar.gz) = 1246794 Index: pkg-plist =================================================================== RCS file: /home/ncvs/FreeBSD/ports/lang/scriba/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 14 Jan 2001 19:45:31 -0000 1.1 +++ pkg-plist 7 Apr 2005 05:00:36 -0000 @@ -1,23 +1,45 @@ bin/scriba etc/scriba/basic.conf -include/scriba/bdb.bas +%%BDB%%include/scriba/bdb.bas include/scriba/cgi.bas +%%CURL%%include/scriba/curl.bas +include/scriba/curses.bas +include/scriba/dbg.bas include/scriba/error.bas -include/scriba/gd.bas +%%GD%%include/scriba/gd.bas include/scriba/hash.bas -include/scriba/heb.bas -include/scriba/heber.bas -include/scriba/md5.bas -include/scriba/mysql.bas +include/scriba/modinst.bas +include/scriba/mt.bas +%%MYSQL%%include/scriba/mysql.bas +%%ODBC%%include/scriba/odbc.bas +%%PGSQL%%include/scriba/psql.bas include/scriba/re.bas -include/scriba/test.bas include/scriba/time.bas +include/scriba/t.bas include/scriba/trial.bas +include/scriba/ux.bas +%%XML%%include/scriba/xml.bas include/scriba/zlib.bas -lib/scriba/basicc.a +%%BDB%%lib/scriba/bdb.so lib/scriba/cgi.so +%%CURL%%lib/scriba/curl.so +lib/scriba/curses.so +lib/scriba/dbg.so +%%GD%%lib/scriba/gd.so lib/scriba/hash.so +lib/scriba/mt.so +%%MYSQL%%lib/scriba/mysql.so +%%ODBC%%lib/scriba/odbc.so +%%PGSQL%%lib/scriba/psql.so lib/scriba/re.so +lib/scriba/t.so +lib/scriba/trial.so +lib/scriba/ux.so +%%XML%%lib/scriba/xml.so +lib/scriba/zlib.so +%%DATADIR%%/source/heber.bas @dirrm etc/scriba @dirrm include/scriba @dirrm lib/scriba +@dirrm share/scriba/source +@dirrm share/scriba --- scriba-20b0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050407050930.658F3917>