cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to sablotron-0.96

Browse Source
This commit is contained in:
avsm 2002-09-11 23:12:55 +00:00
parent 4a4f76dbbe
commit f815a5dd63
10 changed files with 37 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
textproc/sablotron/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.13 2002/08/17 01:08:05 avsm Exp $
# $OpenBSD: Makefile,v 1.14 2002/09/11 23:12:55 avsm Exp $
COMMENT= "fast, compact and portable XSL/XSLT processor"
COMMENT= "fast, compact and portable XSL/XSLT processor"
V= 0.95
DISTNAME= Sablot-${V}
PKGNAME= sablotron-${V}
CATEGORIES= textproc
V= 0.96
DISTNAME= Sablot-${V}
PKGNAME= sablotron-${V}
CATEGORIES= textproc
HOMEPAGE= http://www.gingerall.com/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
HOMEPAGE= http://www.gingerall.com/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
# MPL or GPL
PERMIT_PACKAGE_CDROM= Yes
@ -16,17 +16,17 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://download-2.gingerall.cz/download/sablot/
MASTER_SITES= http://download-2.gingerall.cz/download/sablot/
MODULES= iconv
LIB_DEPENDS= expat.2::textproc/expat
MODULES= iconv
LIB_DEPENDS= expat.2::textproc/expat
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
USE_GMAKE= Yes
CONFIGURE_STYLE=autoconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/tools
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV+= ${CONFIGURE_ENV}
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static \
--enable-debugger --with-expat-prefix=${LOCALBASE} \
--with-iconv-prefix=${LOCALBASE}
.include <bsd.port.mk>

6
textproc/sablotron/distinfo
View File

@ -1,3 +1,3 @@
MD5 (Sablot-0.95.tar.gz) = 5dbcb6eabe8a962f9b84719cdb100390
RMD160 (Sablot-0.95.tar.gz) = db508ec3e76183df20260c540900750ef494b320
SHA1 (Sablot-0.95.tar.gz) = 79bbf59d56f14848588d646ee31b9b48636c66e9
MD5 (Sablot-0.96.tar.gz) = faa64d8005e5bf8328faf85466d096e1
RMD160 (Sablot-0.96.tar.gz) = 1ffff0e1061e7e5ee70b2eb0ea09e1ae3a5bb88a
SHA1 (Sablot-0.96.tar.gz) = 0b9e8a913c66332f54a919e7a555df824a0b56f5

95
textproc/sablotron/patches/patch-configure
View File

@ -1,95 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2002/08/17 01:08:05 avsm Exp $
--- configure.orig Mon Jun 24 13:39:10 2002
+++ configure Sat Aug 17 01:25:59 2002
@@ -2496,7 +2496,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -2993,7 +3000,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -3397,10 +3406,31 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
+ case "$host_cpu" in
+ m88k|hppa|vax)
+ ld_shlibs=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
+ ;;
+ esac
;;
os2*)
@@ -3877,9 +3907,25 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB shared object'
+ case "$host_os" in
+ openbsd2.89 | openbsd2.89.*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

12
textproc/sablotron/patches/patch-src_command_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_command_Makefile_in,v 1.1 2002/09/11 23:12:55 avsm Exp $
--- src/command/Makefile.in.orig Wed Sep 11 23:28:44 2002
+++ src/command/Makefile.in Wed Sep 11 23:30:36 2002
@@ -105,7 +105,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../autocfg
CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L../engine/.libs @LDFLAGS@
sabcmd_OBJECTS = sabcmd.$(OBJEXT)
sabcmd_DEPENDENCIES = ../engine/libsablot.la
sabcmd_LDFLAGS =

29
textproc/sablotron/patches/patch-src_engine_expr_cpp
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-src_engine_expr_cpp,v 1.1 2002/08/17 01:08:05 avsm Exp $
--- src/engine/expr.cpp.orig Tue Jun 25 08:51:06 2002
+++ src/engine/expr.cpp Sat Aug 17 01:30:57 2002
@@ -2252,16 +2252,16 @@ eFlag Expression::eval(Sit S, Expression
{
// if we're resolving globals, this may mean a forward reference
if (resolvingGlobals)
- {
- E( S.getProcessor() -> resolveGlobal(S, c, *pName) );
- ex = S.getProcessor() -> getVarBinding(*pName);
- }
+ {
+ E( S.getProcessor() -> resolveGlobal(S, c, *pName) );
+ ex = S.getProcessor() -> getVarBinding(*pName);
+ }
else
- {
- Str fullName;
- getOwnerTree().expandQStr(*pName, fullName);
- Err1(S, E1_VAR_NOT_FOUND, fullName);
- }
+ {
+ Str fullName;
+ getOwnerTree().expandQStr(*pName, fullName);
+ Err1(S, E1_VAR_NOT_FOUND, fullName);
+ }
};
E( ex -> eval(S, retxpr, c) );
}; break;

12
textproc/sablotron/patches/patch-src_engine_proc_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_engine_proc_cpp,v 1.1 2002/08/17 01:08:05 avsm Exp $
--- src/engine/proc.cpp.orig Tue Jun 25 08:51:06 2002
+++ src/engine/proc.cpp Sat Aug 17 01:30:57 2002
@@ -331,7 +331,7 @@ eFlag Processor::run(Sit S, const char*
*/
vars -> startCall();
// start by resolving all globals
- E( resolveGlobals(S, c) );
+ //E( resolveGlobals(S, c) ); It has been done twice (XSLElement::execute)
E( styleSheet -> getRoot().execute(S, c, FALSE) );
vars -> endCall();
c.del();

19
textproc/sablotron/patches/patch-src_engine_sxpath_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_engine_sxpath_h,v 1.1 2002/08/17 01:08:05 avsm Exp $
--- src/engine/sxpath.h.orig Tue Jun 11 09:54:09 2002
+++ src/engine/sxpath.h Sat Aug 17 01:26:53 2002
@@ -66,9 +66,12 @@ typedef char SXP_char;
typedef void *QueryContext;
/*option constants */
-const unsigned long SXPF_DISPOSE_NAMES = 1;
-const unsigned long SXPF_DISPOSE_VALUES = 2;
-const unsigned long SXPF_SUPPORTS_UNPARSED_ENTITIES = 4;
+typedef enum
+{
+ SXPF_DISPOSE_NAMES = 0x1,
+ SXPF_DISPOSE_VALUES = 0x2,
+ SXPF_SUPPORTS_UNPARSED_ENTITIES =0x4
+} SXPFlags;
/*
* DOM handler functions

27
textproc/sablotron/patches/patch-src_engine_verts_cpp
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_engine_verts_cpp,v 1.1 2002/08/17 01:08:05 avsm Exp $
--- src/engine/verts.cpp.orig Mon Jun 24 13:00:28 2002
+++ src/engine/verts.cpp Sat Aug 17 01:30:58 2002
@@ -1971,7 +1971,8 @@ eFlag XSLElement::execute(Sit S, Context
Processor *proc = NZ(S.getProcessor());
// process globals
- E( getOwner().resolveGlobals(S, c, S.getProcessor()) );
+ //_PH_ globals
+ //E( getOwner().resolveGlobals(S, c, S.getProcessor()) );
// process other top level elements
for (int i = 0; i < contents.number(); i++)
{
@@ -1985,7 +1986,12 @@ eFlag XSLElement::execute(Sit S, Context
// global vars have been executed before
case XSL_VARIABLE:
case XSL_PARAM:
- break;
+ {
+ //_PH_ globals
+ QName temp;
+ temp.empty();
+ proc -> resolveGlobal(S, c, temp, toX(son));
+ }; break;
default: E( son -> execute(S, c, resolvingGlobals) );
}
}

4
textproc/sablotron/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2002/08/17 01:08:05 avsm Exp $
lib/libsablot.so.95.0
@comment $OpenBSD: PFRAG.shared,v 1.8 2002/09/11 23:12:55 avsm Exp $
lib/libsablot.so.96.0
DYNLIBDIR(%D/lib)

4
textproc/sablotron/pkg/PLIST
View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2002/08/17 01:08:05 avsm Exp $
@comment $OpenBSD: PLIST,v 1.6 2002/09/11 23:12:55 avsm Exp $
bin/sabcmd
include/sabcfg.h
include/sabdbg.h
include/sablot.h
include/sdom.h
include/shandler.h