Attachment 149463 Details for Bug 195058 – edbrowse-3.5.1.diff

[patch] edbrowse-3.5.1.diff

edbrowse-3.5.1.diff (text/plain), 2.74 KB, created by david.vionnet on 2014-11-16 00:28:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: david.vionnet

Created: 2014-11-16 00:28:51 UTC

Size: 2.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 372612)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	edbrowse
>-PORTVERSION=	3.4.10
>+PORTVERSION=	3.5.1
> CATEGORIES=	www editors
> MASTER_SITES=	http://the-brannons.com/edbrowse/ \
> 		http://rithmomachia.org/edbrowse/
>@@ -13,7 +13,7 @@
> 
> BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
> LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
>-		libmozjs185.so:${PORTSDIR}/lang/spidermonkey185 \
>+		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24 \
> 		libcurl.so:${PORTSDIR}/ftp/curl
> 
> USE_OPENSSL=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 372612)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (edbrowse-3.4.10.zip) = 58089879c31b571792f76fc53c41374fcbe8386ea82fe451737ae72e8a78e826
>-SIZE (edbrowse-3.4.10.zip) = 737798
>+SHA256 (edbrowse-3.5.1.zip) = e379cffb1098cfedf56ceedaaa7e20064551a0737ad6cd8ad5124fdfb18d9a5f
>+SIZE (edbrowse-3.5.1.zip) = 745277
>Index: files/patch-src-makefile.bsd
>===================================================================
>--- files/patch-src-makefile.bsd	(revision 372612)
>+++ files/patch-src-makefile.bsd	(working copy)
>@@ -1,18 +1,25 @@
>---- makefile.bsd.orig	2014-01-08 00:47:50.667199813 +0100
>-+++ makefile.bsd	2014-01-08 00:50:43.955208907 +0100
>-@@ -2,13 +2,13 @@
>+--- makefile.bsd.orig	2014-09-24 06:50:37.000000000 +0200
>++++ makefile.bsd	2014-11-15 21:16:45.051156527 +0100
>+@@ -1,10 +1,11 @@
>+ #  This is the makefile for edbrowse under BSD Unix.
>  
>- #  Flags for compilation.
>- #  I know - I set the Linux flag here, but it seems to work.
>--CFLAGS = -I/usr/local/include -I/usr/local/include/js -DSYSBSD -DXP_UNIX
>-+CFLAGS = -I${LOCALBASE}/include -I${LOCALBASE}/include/js -DSYSBSD -DXP_UNIX
>+ #  Flags for gcc compilation.
>+-JS_CXXFLAGS =-I/usr/include/mozjs-24
>++JS_CXXFLAGS = -I${LOCALBASE}/include/mozjs-24
>  
>+ # we need to only use the js flags when building with c++, so use CXXFLAGS
>+-CXXFLAGS += $(JS_CXXFLAGS)
>++CFLAGS += -I${LOCALBASE}/include 
>++CXXFLAGS += $(CFLAGS) $(JS_CXXFLAGS)
>+ 
>  #  Tell the dynamic linker to look in the pkg area.
>  LFLAGS = -s -Wl,--rpath -Wl,/usr/pkg/lib
>+@@ -14,7 +15,7 @@
>+ JSLIB = -lmozjs-24
>  
>  #  Libraries for edbrowse.
>--LIBS = -L /usr/local/lib -lpcre -lm -lssl -ljs -lcrypto -lpthread -lcurl
>-+LIBS = -L ${LOCALBASE}/lib -lpcre -lm -lssl -lmozjs185 -lcrypto -pthread -lcurl -lreadline
>+-LDLIBS = -lpcre -lm -lssl $(JSLIB) -lcurl -lreadline -lncurses -lcrypto -lstdc++
>++LIBS = -L${LOCALBASE}/lib -lpcre -lm -lssl $(JSLIB) -lcurl -lreadline -lncurses -lcrypto -lstdc++
>  
>  #  Make the dynamically linked executable program by default.
>  #  Edbrowse executable.
>--- edbrowse-3.5.1.diff ends here ---

Actions: View | Diff

Attachments on bug 195058: 149463