[106593] trunk/dports/www/edbrowse
snc at macports.org
snc at macports.org
Fri May 31 08:07:45 PDT 2013
Revision: 106593
https://trac.macports.org/changeset/106593
Author: snc at macports.org
Date: 2013-05-31 08:07:45 -0700 (Fri, 31 May 2013)
Log Message:
-----------
edbrowse: update to 3.4.9
Modified Paths:
--------------
trunk/dports/www/edbrowse/Portfile
Added Paths:
-----------
trunk/dports/www/edbrowse/files/patch-makefile.diff
Removed Paths:
-------------
trunk/dports/www/edbrowse/files/patch-makefile.osx.diff
Modified: trunk/dports/www/edbrowse/Portfile
===================================================================
--- trunk/dports/www/edbrowse/Portfile 2013-05-31 14:20:16 UTC (rev 106592)
+++ trunk/dports/www/edbrowse/Portfile 2013-05-31 15:07:45 UTC (rev 106593)
@@ -4,8 +4,7 @@
PortSystem 1.0
name edbrowse
-version 3.4.7
-revision 1
+version 3.4.9
categories www
license GPL
maintainers snc email.uc.edu:obrienj
@@ -26,8 +25,9 @@
homepage http://the-brannons.com/edbrowse/
platforms darwin freebsd
+installs_libs no
depends_lib port:pcre \
- port:spidermonkey \
+ port:spidermonkey185 \
port:curl \
port:readline \
port:openssl
@@ -36,25 +36,25 @@
use_zip yes
dist_subdir ${name}-1
-checksums rmd160 baa0bf1c3cb4320aaee3c2c556bc910ca5502a71 \
- sha256 488d8a02b4480f1474686dfa99058b7f2f36c1d4eb1942ee79471aa8327328fe
+checksums rmd160 96b3b88968ea3a1f52f91deff80662a5ab206bee \
+ sha256 ef4690e0f695bddf97194e3be5a4b7b999b8af07639e8c6cc02539b6296f3813
-worksrcdir ${distname}/src
-
-patchfiles patch-makefile.osx.diff
+patchfiles patch-makefile.diff
post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/makefile.osx
- reinplace "s|@@DESTROOT@@|${destroot}${prefix}|g" ${worksrcpath}/makefile.osx
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/makefile
}
use_configure no
variant universal {}
-build.env-append CC="${configure.cc} [get_canonical_archflags cc]"
-build.args -f makefile.osx
+configure.cppflags-append -I${prefix}/include/mozjs185
+build.env-append CC="${configure.cc} [get_canonical_archflags cc]" CFLAGS="${configure.cflags}" CPPFLAGS="${configure.cppflags} -DSYSBSD -DXP_UNIX -DX86_LINUX"
+build.args STRIP=''
-destroot.args -f makefile.osx
+destroot {
+ xinstall ${worksrcpath}/src/${name} ${destroot}${prefix}/bin
+}
livecheck.regex {(3.[0-9].[0-9])}
livecheck.type regex
Copied: trunk/dports/www/edbrowse/files/patch-makefile.diff (from rev 106589, trunk/dports/www/edbrowse/files/patch-makefile.osx.diff)
===================================================================
--- trunk/dports/www/edbrowse/files/patch-makefile.diff (rev 0)
+++ trunk/dports/www/edbrowse/files/patch-makefile.diff 2013-05-31 15:07:45 UTC (rev 106593)
@@ -0,0 +1,37 @@
+--- src/makefile.orig 2012-12-29 09:22:58.000000000 -0500
++++ src/makefile 2013-05-31 10:54:46.000000000 -0400
+@@ -1,6 +1,6 @@
+ # This is the makefile for edbrowse.
+
+-prefix = /usr/local
++prefix = @@PREFIX@@
+ bindir = $(prefix)/bin
+
+ # Flags for gcc compilation.
+@@ -15,7 +15,7 @@
+
+ # C preprocessor flags. CPPFLAGS is used in the %.o: %.c implicit rule,
+ # available in GNU make.
+-CPPFLAGS = $(JS_CPPFLAGS)
++#CPPFLAGS = $(JS_CPPFLAGS)
+
+ # By default, we strip the executables.
+ # Override this behavior on the command line, by setting STRIP to the
+@@ -59,7 +59,7 @@
+
+ # You probably need to be root to do this.
+ install:
+- install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
++ install -m755 edbrowse $(DESTDIR)$(bindir)/edbrowse
+
+ # If you had to build the javascript library yourself,
+ # link it into /usr/lib.
+@@ -102,7 +102,7 @@
+
+ STATICLIBS = -lodbc -lpcre -lm -ljs -lcurl -lssl -lc -lcrypto -lpthread -lm -ldl -lrt
+ edbrowse.static: $(EBOBJS) tcp.o dbops.o dbodbc.o
+- cc --static $(LFLAGS) -o edbrowse.static $(EBOBJS) tcp.o dbops.o dbodbc.o $(STATICLIBS)
++ $(CC) --static $(LFLAGS) -o edbrowse.static $(EBOBJS) tcp.o dbops.o dbodbc.o $(STATICLIBS)
+
+ clean:
+ rm -f *.o edbrowse edbrowseinf edbrowseodbc edbrowse.static
Deleted: trunk/dports/www/edbrowse/files/patch-makefile.osx.diff
===================================================================
--- trunk/dports/www/edbrowse/files/patch-makefile.osx.diff 2013-05-31 14:20:16 UTC (rev 106592)
+++ trunk/dports/www/edbrowse/files/patch-makefile.osx.diff 2013-05-31 15:07:45 UTC (rev 106593)
@@ -1,53 +0,0 @@
---- makefile.osx.orig 2010-10-10 12:34:47.000000000 -0400
-+++ makefile.osx 2010-10-10 12:35:17.000000000 -0400
-@@ -3,7 +3,7 @@
-
- # Flags for gcc compilation.
- # Performance is not vital here, and -O is buggy, so I leave it out.
--# The -I flags assume smjs is installed in /opt/local/include/js via macports
-+# The -I flags assume smjs is installed in @@PREFIX@@/include/js via macports
-
- # Allow for symbolic debugging.
- DEBUGFLAGS=-g -ggdb
-@@ -11,16 +11,16 @@
- DEBUGFLAGS=
- endif
-
--CFLAGS = -I/usr/include -I/opt/local/include -I/opt/local/include/js -DSYSBSD -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS)
-+CFLAGS = -I@@PREFIX@@/include -I@@PREFIX@@/include/js -DSYSBSD -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS)
-
- # Normal load flags, plus flags for macports
--LFLAGS = -L/usr/lib -L/opt/local/lib
-+LFLAGS = -L@@PREFIX@@/lib
-
- # Libraries for edbrowse.
--# I assume you have linked libjs.so into /opt/local/lib/libjs.a
-+# I assume you have linked libjs.so into @@PREFIX@@/lib/libjs.a
- # so that -ljs will suffice.
- # -lcrypto is necessary on OS X to provide some ssl functions
--LIBS = -lpcre -lm -lssl -ljs -lcurl -lcrypto
-+LIBS = -lpcre -lm -lssl -ljs -lcurl -lcrypto -lreadline
-
- # Make the dynamically linked edbrowse executable by default.
- all: edbrowse
-@@ -33,16 +33,16 @@
- $(EBOBJS) : eb.h eb.p messages.h tcp.h
-
- edbrowse: $(EBOBJS) tcp.o dbstubs.o
-- cc $(LFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS)
-+ $(CC) $(LFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS)
-
- # You probably need to be root to do this.
- install:
-- install edbrowse /usr/local/bin
-+ install edbrowse @@DESTROOT@@/bin
-
- # odbc stuff
- dbodbc.o dbops.o : dbapi.h eb.h eb.p
-
- edbrowseodbc: $(EBOBJS) tcp.o dbops.o dbodbc.o
-- cc $(LFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc
-+ $(CC) $(LFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc
-
- # Build function prototypes.
- # mkproto is my program, not a general unix utility.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130531/aee9f856/attachment-0001.html>
More information about the macports-changes
mailing list