Attachment 146338 Details for Bug 193040 – lang_qscheme.diff

[patch] lang_qscheme.diff

lang_qscheme.diff (text/plain), 8.76 KB, created by tkato432 on 2014-08-26 18:39:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-26 18:39:06 UTC

Size: 8.76 KB

patch

obsolete

>diff -urN /usr/ports/lang/qscheme/Makefile lang/qscheme/Makefile
>--- /usr/ports/lang/qscheme/Makefile	2014-07-24 03:57:03.000000000 +0900
>+++ lang/qscheme/Makefile	2014-08-27 00:00:00.000000000 +0900
>@@ -3,23 +3,24 @@
> 
> PORTNAME=	qscheme
> PORTVERSION=	0.5.1
>-PORTREVISION=	6
>+PORTREVISION=	8
> CATEGORIES=	lang scheme
> MASTER_SITES=	http://www.sof.ch/dan/qscheme/files/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Small and fast Scheme interpreter
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libavcall.a:${PORTSDIR}/devel/ffcall\
>+LICENSE=	GPLv2
>+
>+BUILD_DEPENDS=	${LOCALBASE}/lib/libavcall.a:${PORTSDIR}/devel/ffcall \
> 		${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre \
> 		${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp
> LIB_DEPENDS=	libgetline.so:${PORTSDIR}/devel/libgetline
> 
> USES=		gmake perl5
> USE_PERL5=	build
>+USE_GCC=	any
> GNU_CONFIGURE=	yes
>-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
>-
> CONFIGURE_ARGS=	--with-pcre-dir=${LOCALBASE}/lib \
> 		--with-pcre-inc=${LOCALBASE}/include \
> 		--with-avcall-dir=${LOCALBASE}/lib \
>@@ -27,20 +28,25 @@
> 		--with-gmp-dir=${LOCALBASE}/lib \
> 		--with-gmp-inc=${LOCALBASE}/include
> 
>-NO_STAGE=	yes
>+CFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib -lgetline
>+
>+PLIST_SUB=	VERSION="${PORTVERSION}"
>+
>+# because it uses static pcre lib, which is compiled without -fPIC.
>+# pcre problem likely.
>+BROKEN_amd64=		Does not build on ${ARCH}
>+BROKEN_sparc64=		Does not build on ${ARCH}
>+
>+OPTIONS_DEFINE=	DOCS
>+
> post-patch:
>-	${REINPLACE_CMD} \
>-		-e "s,^LIBS = @LIBS@,& ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lgetline," \
>-		-e "s,^CFLAGS = @CFLAGS@,& ${PTHREAD_CFLAGS}," \
>-		${WRKSRC}/Makefile.in
>-	${REINPLACE_CMD} \
>-		-e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
>-
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "ia64" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
>-# because it uses static pcre lib, which is compiled without -fPIC. pcre problem likely.
>-BROKEN=		Does not build on amd64, ia64, or sparc64
>-.endif
>+	@${REINPLACE_CMD} -e \
>+		's|-lpthread|-pthread| ; \
>+		 /SCM_DEFAULT_LIB_PATH/s|$$datadir|$$prefix/lib|' \
>+		${WRKSRC}/configure
>+
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/qscheme/*/*.so
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/lang/qscheme/files/patch-Makefile.in lang/qscheme/files/patch-Makefile.in
>--- /usr/ports/lang/qscheme/files/patch-Makefile.in	2014-06-21 17:41:10.000000000 +0900
>+++ lang/qscheme/files/patch-Makefile.in	2014-08-27 00:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
> --- Makefile.in.orig	2000-06-23 02:10:21.000000000 +0300
> +++ Makefile.in	2009-03-03 18:30:51.000000000 +0200
>-@@ -111,7 +111,7 @@
>+@@ -111,11 +111,11 @@
>  EXTRA_DIST = mkoptable mkwhatis $(modsrc) $(scmsrc) CHANGES LICENCE_EXCEPTION
>  
>  # other directories
>@@ -9,6 +9,11 @@
>  
>  noinst_LIBRARIES = libqs.a
>  
>+-shared_dir = $(prefix)/share/qscheme/$(VERSION)
>++shared_dir = $(prefix)/lib/qscheme/$(VERSION)
>+ 
>+ scmobjdir = $(shared_dir)
>+ scmobj_DATA = $(modobj) $(scmsrc)
> @@ -578,12 +578,12 @@
>  	$(COMPILE) -o $@ -shared -fPIC -I$(incpcre) $(srcdir)/regex.c $(PCRE_LIB)
>  
>@@ -27,3 +32,12 @@
>  
>  # force sproto.h to be up to date. Otherwise compilation of
>  # distribution may fail, because sproto.h can trigger the cfunction
>+@@ -594,7 +594,7 @@
>+ 
>+ # force the x bit on the shared libraries
>+ install-data-local:
>+-	chmod +x $(shared_dir)/*.so
>++	chmod +x $(DESTDIR)$(shared_dir)/*.so
>+ 
>+ whatis: whatis.qs
>+ 
>diff -urN /usr/ports/lang/qscheme/files/patch-doc__Makefile.in lang/qscheme/files/patch-doc__Makefile.in
>--- /usr/ports/lang/qscheme/files/patch-doc__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ lang/qscheme/files/patch-doc__Makefile.in	2014-08-27 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- doc/Makefile.in.orig
>++++ doc/Makefile.in
>+@@ -71,7 +71,7 @@
>+ #
>+ #
>+ #
>+-docdir=$(DESTDIR)$(pkgdatadir)/$(VERSION)/doc
>++docdir=$(DESTDIR)$(datadir)/doc/@PACKAGE@
>+ 
>+ HTMLDIR=$(srcdir)/html
>+ 
>diff -urN /usr/ports/lang/qscheme/pkg-descr lang/qscheme/pkg-descr
>--- /usr/ports/lang/qscheme/pkg-descr	2014-06-21 17:41:10.000000000 +0900
>+++ lang/qscheme/pkg-descr	2014-08-27 00:00:00.000000000 +0900
>@@ -1,8 +1,9 @@
>-QScheme is a fast and small implementation of Scheme written in C. QScheme is
>-easy to interface and should be easy to use as an extension language.
>+QScheme is a fast and small implementation of Scheme written in C.
>+QScheme is easy to interface and should be easy to use as an extension
>+language.
> 
>-QScheme currently supports foreign function call and dynamic library. A perl
>-like regular expression module is provided as example.
>+QScheme currently supports foreign function call and dynamic library. A
>+perl like regular expression module is provided as example.
> 
> QScheme is really fast: benchmarks (still a little old) shows that it is
> generaly between 2 and 70 times faster than other scheme interpreters.
>diff -urN /usr/ports/lang/qscheme/pkg-plist lang/qscheme/pkg-plist
>--- /usr/ports/lang/qscheme/pkg-plist	2014-06-21 17:41:10.000000000 +0900
>+++ lang/qscheme/pkg-plist	2014-08-27 00:00:00.000000000 +0900
>@@ -1,47 +1,47 @@
> bin/qscheme
>-share/qscheme/%%PORTVERSION%%/regex.so
>-share/qscheme/%%PORTVERSION%%/object.so
>-share/qscheme/%%PORTVERSION%%/process.so
>-share/qscheme/%%PORTVERSION%%/struct.so
>-share/qscheme/%%PORTVERSION%%/socket.so
>-share/qscheme/%%PORTVERSION%%/unix.so
>-share/qscheme/%%PORTVERSION%%/s.scm
>-share/qscheme/%%PORTVERSION%%/macro.scm
>-share/qscheme/%%PORTVERSION%%/loop.scm
>-share/qscheme/%%PORTVERSION%%/wloop.scm
>-share/qscheme/%%PORTVERSION%%/fib.scm
>-share/qscheme/%%PORTVERSION%%/cat.scm
>-share/qscheme/%%PORTVERSION%%/doc/s.dvi
>-share/qscheme/%%PORTVERSION%%/doc/s.ps
>-share/qscheme/%%PORTVERSION%%/doc/html/WARNINGS
>-share/qscheme/%%PORTVERSION%%/doc/html/footnode.html
>-share/qscheme/%%PORTVERSION%%/doc/html/images.aux
>-share/qscheme/%%PORTVERSION%%/doc/html/images.log
>-share/qscheme/%%PORTVERSION%%/doc/html/images.pl
>-share/qscheme/%%PORTVERSION%%/doc/html/images.tex
>-share/qscheme/%%PORTVERSION%%/doc/html/img1.png
>-share/qscheme/%%PORTVERSION%%/doc/html/img2.png
>-share/qscheme/%%PORTVERSION%%/doc/html/index.html
>-share/qscheme/%%PORTVERSION%%/doc/html/internals.pl
>-share/qscheme/%%PORTVERSION%%/doc/html/labels.pl
>-share/qscheme/%%PORTVERSION%%/doc/html/node1.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node10.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node11.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node12.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node13.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node14.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node15.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node2.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node3.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node4.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node5.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node6.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node7.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node8.html
>-share/qscheme/%%PORTVERSION%%/doc/html/node9.html
>-share/qscheme/%%PORTVERSION%%/doc/html/s.css
>-share/qscheme/%%PORTVERSION%%/doc/html/s.html
>-@dirrm share/qscheme/%%PORTVERSION%%/doc/html
>-@dirrm share/qscheme/%%PORTVERSION%%/doc
>-@dirrm share/qscheme/%%PORTVERSION%%
>-@dirrm share/qscheme
>+lib/qscheme/%%VERSION%%/regex.so
>+lib/qscheme/%%VERSION%%/object.so
>+lib/qscheme/%%VERSION%%/process.so
>+lib/qscheme/%%VERSION%%/struct.so
>+lib/qscheme/%%VERSION%%/socket.so
>+lib/qscheme/%%VERSION%%/unix.so
>+lib/qscheme/%%VERSION%%/s.scm
>+lib/qscheme/%%VERSION%%/macro.scm
>+lib/qscheme/%%VERSION%%/loop.scm
>+lib/qscheme/%%VERSION%%/wloop.scm
>+lib/qscheme/%%VERSION%%/fib.scm
>+lib/qscheme/%%VERSION%%/cat.scm
>+%%PORTDOCS%%%%DOCSDIR%%/s.dvi
>+%%PORTDOCS%%%%DOCSDIR%%/s.ps
>+%%PORTDOCS%%%%DOCSDIR%%/html/WARNINGS
>+%%PORTDOCS%%%%DOCSDIR%%/html/footnode.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/images.aux
>+%%PORTDOCS%%%%DOCSDIR%%/html/images.log
>+%%PORTDOCS%%%%DOCSDIR%%/html/images.pl
>+%%PORTDOCS%%%%DOCSDIR%%/html/images.tex
>+%%PORTDOCS%%%%DOCSDIR%%/html/img1.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/img2.png
>+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/internals.pl
>+%%PORTDOCS%%%%DOCSDIR%%/html/labels.pl
>+%%PORTDOCS%%%%DOCSDIR%%/html/node1.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node10.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node11.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node12.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node13.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node14.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node15.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node2.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node3.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node4.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node5.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node6.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node7.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node8.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/node9.html
>+%%PORTDOCS%%%%DOCSDIR%%/html/s.css
>+%%PORTDOCS%%%%DOCSDIR%%/html/s.html
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrm lib/qscheme/%%VERSION%%
>+@dirrm lib/qscheme

Actions: View | Diff

Attachments on bug 193040: 146338