OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 28-Apr-2009 22:15:59 Branch: HEAD Handle: 2009042821155900 Added files: openpkg-src/ejs ejs.patch ejs.spec Log: new package: ejs 0.9.8.8 (Embedded JavaScript) Summary: Revision Changes Path 1.1 +175 -0 openpkg-src/ejs/ejs.patch 1.1 +118 -0 openpkg-src/ejs/ejs.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/ejs/ejs.patch ============================================================================ $ cvs diff -u -r0 -r1.1 ejs.patch --- /dev/null 2009-04-28 22:15:57 +0200 +++ ejs.patch 2009-04-28 22:15:59 +0200 @@ -0,0 +1,175 @@ +Index: build/config/config.FREEBSD +--- build/config/config.FREEBSD.orig 2009-04-23 21:27:02 +0200 ++++ build/config/config.FREEBSD 2009-04-28 21:46:24 +0200 +@@ -8,4 +8,4 @@ + # + ############################################################################### + +-. build/os/config.base ++. build/config/config.base +Index: build/make/make.gcc +--- build/make/make.gcc.orig 2009-04-23 21:27:02 +0200 ++++ build/make/make.gcc 2009-04-28 21:46:24 +0200 +@@ -218,16 +218,15 @@ + # + # Support for dynamically loadable modules is present in shared and static builds + # +-ifneq ($(BLD_OS),VXWORKS) ++ifeq ($(BLD_OS),LINUX) + _LIBS += -ldl +- ++endif + ifeq ($(BLD_FEATURE_FLOATING_POINT),1) + _LIBS += -lm + endif + ifeq ($(BLD_FEATURE_AUTH_PAM),1) + _LIBS += -lpam + endif +-endif + + # + # Using the standard C++ library. Default for products using C++ is to use their own C++ library to save space. +Index: src/include/mpr.h +--- src/include/mpr.h.orig 2009-04-23 21:27:11 +0200 ++++ src/include/mpr.h 2009-04-28 21:46:24 +0200 +@@ -71,6 +71,7 @@ + #include <libgen.h> + #include <limits.h> + #include <netdb.h> ++ #include <sys/socket.h> + #include <net/if.h> + #include <netinet/in.h> + #include <netinet/tcp.h> +@@ -95,7 +96,6 @@ + #include <sys/resource.h> + #include <sys/sem.h> + #include <sys/shm.h> +- #include <sys/socket.h> + #include <sys/select.h> + #include <sys/time.h> + #include <sys/times.h> +@@ -118,7 +118,7 @@ + #define __USE_ISOC99 1 + #include <math.h> + #if !CYGWIN +- #include <values.h> ++ #include <limits.h> + #endif + #endif + +Index: src/mpr/mprLib.c +--- src/mpr/mprLib.c.orig 2009-04-23 21:27:04 +0200 ++++ src/mpr/mprLib.c 2009-04-28 21:46:24 +0200 +@@ -1956,6 +1956,8 @@ + + } + #elif FREEBSD ++#include <sys/types.h> ++#include <sys/sysctl.h> + { + int cmd[2]; + size_t len; +Index: src/mpr/mprPcre.c +--- src/mpr/mprPcre.c.orig 2009-04-23 21:27:04 +0200 ++++ src/mpr/mprPcre.c 2009-04-28 21:46:24 +0200 +@@ -72,6 +72,7 @@ + #include <libgen.h> + #include <limits.h> + #include <netdb.h> ++ #include <sys/socket.h> + #include <net/if.h> + #include <netinet/in.h> + #include <netinet/tcp.h> +@@ -96,7 +97,6 @@ + #include <sys/resource.h> + #include <sys/sem.h> + #include <sys/shm.h> +- #include <sys/socket.h> + #include <sys/select.h> + #include <sys/time.h> + #include <sys/times.h> +@@ -119,7 +119,7 @@ + #define __USE_ISOC99 1 + #include <math.h> + #if !CYGWIN +- #include <values.h> ++ #include <limits.h> + #endif + #endif + +Index: src/mpr/mprSsl.c +--- src/mpr/mprSsl.c.orig 2009-04-23 21:27:04 +0200 ++++ src/mpr/mprSsl.c 2009-04-28 21:46:24 +0200 +@@ -71,6 +71,7 @@ + #include <libgen.h> + #include <limits.h> + #include <netdb.h> ++ #include <sys/socket.h> + #include <net/if.h> + #include <netinet/in.h> + #include <netinet/tcp.h> +@@ -95,7 +96,6 @@ + #include <sys/resource.h> + #include <sys/sem.h> + #include <sys/shm.h> +- #include <sys/socket.h> + #include <sys/select.h> + #include <sys/time.h> + #include <sys/times.h> +@@ -118,7 +118,7 @@ + #define __USE_ISOC99 1 + #include <math.h> + #if !CYGWIN +- #include <values.h> ++ #include <limits.h> + #endif + #endif + +Index: src/web/gateways/ejsCgi.c +--- src/web/gateways/ejsCgi.c.orig 2009-04-23 21:27:05 +0200 ++++ src/web/gateways/ejsCgi.c 2009-04-28 21:47:02 +0200 +@@ -15,6 +15,8 @@ + + #include "ejs.h" + ++extern char **environ; ++ + /***************************** Forward Declarations *****************************/ + + static void copyFile(cchar *url); +Index: src/appweb/appwebLib.c +--- src/appweb/appwebLib.c.orig 2009-04-23 21:27:03 +0200 ++++ src/appweb/appwebLib.c 2009-04-28 21:51:45 +0200 +@@ -3879,7 +3879,7 @@ + + + +-#if BLD_FEATURE_SEND && (MACOSX || LINUX) ++#if BLD_FEATURE_SEND && (MACOSX || LINUX || FREEBSD) + + + static void addPacketForSend(MaQueue *q, MaPacket *packet); +@@ -15513,7 +15513,7 @@ + http->uid = http->gid = -1; + #endif + +-#if BLD_FEATURE_SEND && !WIN ++#if BLD_FEATURE_SEND && (MACOSX || LINUX || FREEBSD) + maOpenSendConnector(http); + #endif + #if BLD_FEATURE_NET +Index: build/bin/makeInstall +--- build/bin/makeInstall.orig 2009-04-28 22:01:40 +0200 ++++ build/bin/makeInstall 2009-04-28 22:04:12 +0200 +@@ -295,9 +295,9 @@ + + . package/makeInstall.${BLD_PRODUCT} + ++ CHGRP="true chgrp" ++ CHOWN="true chown" + if [ "$DRY_RUN" = 1 ] ; then +- CHGRP="true chgrp" +- CHOWN="true chown" + CHMOD="true chmod" + CP="true cp" + GZIP="true gzip" @@ . patch -p0 <<'@@ .' Index: openpkg-src/ejs/ejs.spec ============================================================================ $ cvs diff -u -r0 -r1.1 ejs.spec --- /dev/null 2009-04-28 22:15:57 +0200 +++ ejs.spec 2009-04-28 22:15:59 +0200 @@ -0,0 +1,118 @@ +## +## ejs.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package version +%define V_base 0.9.8 +%define V_rev 8 + +# package information +Name: ejs +Summary: Embedded JavaScript +URL: http://www.ejscript.org/ +Vendor: Embedthis Software, LLC +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class: EVAL +Group: Language +License: GPL +Version: %{V_base}.%{V_rev} +Release: 20090428 + +# list of sources +Source0: http://www.ejscript.org/software/ejs-src-%{V_base}-%{V_rev}.tar.gz +Patch0: ejs.patch + +# build information +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20060823 +PreReq: OpenPKG, openpkg >= 20060823 +AutoReq: no +AutoReqProv: no + +%description + Ejscript is a compact, fast and powerful implementation of + JavaScript. It fully complies with the ECMAScript Edition 3 + specification, and adds enhancements such as modules, class + declarations, optional typing, and a rich system library. + +%track + prog ejs = { + version = %{version} + url = http://www.ejscript.org/downloads/ejs/download.php + regex = ejs-(__VER__)\.tar\.gz + } + +%prep + %setup -q -n ejs-%{V_base} + %patch -p0 + cp -p build/make/make.LINUX build/make/make.FREEBSD + +%build + %{l_shtool} subst \ + -e 's;/bin/bash;%{l_bash};g' \ + -e 's;`bash;`%{l_bash};g' \ + configure \ + build/product.config \ + build/release.defaults \ + build/standard.defaults \ + build/bin/all-in-one \ + build/bin/bld \ + build/bin/fakePriv \ + build/bin/makeInstall \ + build/bin/makePackage \ + build/bin/makeProj \ + build/bin/makeVsProj \ + build/bin/makedep \ + build/bin/priv \ + build/config/config.* \ + build/make/Makefile.top \ + build/make/make.WIN \ + build/make/make.gcc \ + src/test/ejsTest.ksh \ + package/install.sh \ + package/uninstall.sh + CC="%{l_cc}" \ + CXX="%{l_cxx}" \ + CFLAGS="%{l_cflags -O}" \ + CXXFLAGS="%{l_cxxflags -O}" \ + CPPFLAGS="%{l_cppflags}" \ + LDFLAGS="%{l_ldflags}" \ + %{l_bash} ./configure \ + --prefix=$RPM_BUILD_ROOT%{l_prefix} \ + --binDir=$RPM_BUILD_ROOT%{l_prefix}/bin \ + --manDir=$RPM_BUILD_ROOT%{l_prefix}/man \ + --search=%{l_prefix}/bin:%{l_prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin + %{l_make} %{l_mflags} + +%install + rm -rf $RPM_BUILD_ROOT + %{l_make} %{l_mflags} install + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + +%files -f files + +%clean + rm -rf $RPM_BUILD_ROOT + @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org