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

Update to 0.3.12 and regen patches.

Browse Source 
In addition to the usual bug fixing this update does away with the hack
that built a custom XML catalog file (now that we have proper XML catalog
support).  This will cause some problems with scrollkeeper dependent ports
until I commit the fix for them shortly.
This commit is contained in:
marcm 2003-07-12 06:24:49 +00:00
parent 8d10c17eec
commit 49cbad047c
15 changed files with 148 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
textproc/scrollkeeper/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2002/11/30 04:41:29 marcm Exp $
# $OpenBSD: Makefile,v 1.11 2003/07/12 06:24:49 marcm Exp $
COMMENT= "Scrollkeeper Open Documentation Cataloging System"
DISTNAME= scrollkeeper-0.3.11
DISTNAME= scrollkeeper-0.3.12
CATEGORIES= textproc
HOMEPAGE= http://scrollkeeper.sourceforge.net
@ -20,10 +20,11 @@ PERMIT_DISTFILES_FTP= Yes
MODULES= gettext
BUILD_DEPENDS= :docbook->=4.1.2:textproc/docbook \
BUILD_DEPENDS= :docbook->=4.2p1:textproc/docbook \
:intltool->=0.8.4:textproc/intltool
RUN_DEPENDS= :docbook->=4.1.2:textproc/docbook
LIB_DEPENDS= xml2.6::textproc/libxml \
RUN_DEPENDS= :docbook->=4.2p1:textproc/docbook \
:libxml->=2.5.7p1:textproc/libxml
LIB_DEPENDS= xml2.7::textproc/libxml \
xslt.1::textproc/libxslt
USE_GMAKE= Yes
@ -35,8 +36,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/xml; \
sh ${FILESDIR}/buildDocBookCatalog.openbsd
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scrollkeeper; \
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/scrollkeeper/

6
textproc/scrollkeeper/distinfo
View File

@ -1,3 +1,3 @@
MD5 (scrollkeeper-0.3.11.tar.bz2) = 91212198f6d11adabdaf429d24acb21c
RMD160 (scrollkeeper-0.3.11.tar.bz2) = 134ea07dcba93bd2c32a5e2509bc9414c980f0e8
SHA1 (scrollkeeper-0.3.11.tar.bz2) = a7be5a22372d22eccb599bd4f0e3996f4b6c174c
MD5 (scrollkeeper-0.3.12.tar.bz2) = c6ce2b4cf005e31b7b1c2d46b82a831c
RMD160 (scrollkeeper-0.3.12.tar.bz2) = 3b15819eca6fd1e27559435394744dba55611764
SHA1 (scrollkeeper-0.3.12.tar.bz2) = e88f5abf4505802ad54b32ab11d6b29d4ece6fb2

142
textproc/scrollkeeper/files/buildDocBookCatalog.openbsd
View File

@ -1,142 +0,0 @@
#!/bin/sh
#
# $OpenBSD: buildDocBookCatalog.openbsd,v 1.1 2002/11/30 04:41:29 marcm Exp $
#
# Based (very) loosly on: http://xmlsoft.org/buildDocBookCatalog
# Setup...
_rootcatalog="share/xml/catalog.scrollkeeper"
_catalog="share/xml/docbook.scrollkeeper"
ROOTCATALOG="$PREFIX/$_rootcatalog"
CATALOG="$PREFIX/$_catalog"
TRUEROOTCATALOG="$TRUEPREFIX/$_rootcatalog"
TRUECATALOG="$TRUEPREFIX/$_catalog"
docbookdir="$TRUEPREFIX/share/xml/docbook/4.1.2"
isodir="$docbookdir/ent"
echo "Installing root catalog into $ROOTCATALOG"
echo "Installing docbook catalog into $CATALOG"
# Create the catalogs if necessary...
if [ ! -r $ROOTCATALOG ] ; then
$TRUEPREFIX/bin/xmlcatalog --noout --create $ROOTCATALOG
fi
if [ ! -r $CATALOG ] ; then
$TRUEPREFIX/bin/xmlcatalog --noout --create $CATALOG
fi
# docbook catalog...
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
"file://$docbookdir/dbpoolx.mod" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V4.1.2//EN" \
"file://$docbookdir/docbookx.dtd" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
"file://$docbookdir/dbcentx.mod" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
"file://$docbookdir/dbnotnx.mod" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
"file://$docbookdir/dbgenent.mod" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
"file://$docbookdir/dbhierx.mod" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
"file://$docbookdir/soextblx.dtd" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
"file://$docbookdir/calstblx.dtd" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/4.1.2" \
"file://$docbookdir" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/4.1.2" \
"file://$docbookdir" $CATALOG
# root catalog...
$TRUEPREFIX/bin/xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//ENTITIES DocBook XML" \
"file://$TRUECATALOG" $ROOTCATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//DTD DocBook XML" \
"file://$TRUECATALOG" $ROOTCATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "delegateSystem" \
"http://www.oasis-open.org/docbook/" \
"file://$TRUECATALOG" $ROOTCATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "delegateURI" \
"http://www.oasis-open.org/docbook/" \
"file://$TRUECATALOG" $ROOTCATALOG
# iso entities...
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Publishing//EN" \
"file://$isodir/iso-pub.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Greek Letters//EN" \
"file://$isodir/iso-grk1.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
"file://$isodir/iso-box.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Greek Symbols//EN" \
"file://$isodir/iso-grk3.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
"file://$isodir/iso-amsn.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
"file://$isodir/iso-num.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
"file://$isodir/iso-grk4.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
"file://$isodir/iso-dia.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
"file://$isodir/iso-grk2.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
"file://$isodir/iso-amsa.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
"file://$isodir/iso-amso.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
"file://$isodir/iso-cyr1.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES General Technical//EN" \
"file://$isodir/iso-tech.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
"file://$isodir/iso-amsc.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Latin 1//EN" \
"file://$isodir/iso-lat1.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
"file://$isodir/iso-amsb.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Latin 2//EN" \
"file://$isodir/iso-lat2.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
"file://$isodir/iso-amsr.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
"file://$isodir/iso-cyr2.ent" $CATALOG
$TRUEPREFIX/bin/xmlcatalog --noout --add "delegatePublic" \
"ISO 8879:1986" \
"file://$TRUECATALOG" $ROOTCATALOG
# Scrollkeeper...
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
"file://$TRUEPREFIX/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $ROOTCATALOG
echo "Done."

13
textproc/scrollkeeper/patches/patch-Makefile_in
View File

@ -1,11 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- Makefile.in.orig Sun Sep 8 00:21:43 2002
+++ Makefile.in Sun Sep 8 00:21:54 2002
@@ -448,14 +448,6 @@ dist-hook: scrollkeeper.spec
cp scrollkeeper.spec $(distdir)
$OpenBSD: patch-Makefile_in,v 1.2 2003/07/12 06:24:49 marcm Exp $
--- Makefile.in.orig Sun Jun 15 16:13:10 2003
+++ Makefile.in Sun Jun 15 16:13:21 2003
@@ -536,13 +536,6 @@ dist-hook: scrollkeeper.spec
# Build/rebuild the catalog
install-data-hook:
- # Build/rebuild the catalog
- rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir)
- $(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir)
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
@ -14,5 +13,5 @@ $OpenBSD: patch-Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
- PATH="$(PATH):$(DESTDIR)$(bindir)" ; \
- $(DESTDIR)$(bindir)/scrollkeeper-rebuilddb -q -p $(DESTDIR)$(scrollkeeper_localstate_dir)
# Remove generated files
uninstall-local:
# Remove generated files

29
textproc/scrollkeeper/patches/patch-buildtools_Makefile_in
View File

@ -1,19 +1,12 @@
$OpenBSD: patch-buildtools_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- buildtools/Makefile.in.orig Wed Jul 24 19:27:31 2002
+++ buildtools/Makefile.in Sat Sep 7 18:32:30 2002
@@ -154,13 +154,13 @@ PROGRAMS = $(noinst_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L$(top_builddir)/libs/.libs @LDFLAGS@
LIBS = @LIBS@
scrollkeeper_tree_separate_OBJECTS = separate.$(OBJEXT)
$OpenBSD: patch-buildtools_Makefile_in,v 1.2 2003/07/12 06:24:49 marcm Exp $
--- buildtools/Makefile.in.orig Wed Jan 22 22:11:57 2003
+++ buildtools/Makefile.in Sun Jun 15 15:56:44 2003
@@ -172,7 +172,7 @@ scrollkeeper_tree_separate_OBJECTS = \
scrollkeeper_tree_separate_LDADD = $(LDADD)
scrollkeeper_tree_separate_DEPENDENCIES = \
$(top_builddir)/libs/libscrollkeeper.la
-scrollkeeper_tree_separate_LDFLAGS =
+scrollkeeper_tree_separate_LDFLAGS = $(INTLLIBS)
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
scrollkeeper_tree_separate_DEPENDENCIES = \
$(top_builddir)/libs/libscrollkeeper.la
-scrollkeeper_tree_separate_LDFLAGS =
+scrollkeeper_tree_separate_LDFLAGS = $(INTLLIBS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

17
textproc/scrollkeeper/patches/patch-cl_src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cl_src_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- cl/src/Makefile.in.orig Wed Jul 24 19:27:37 2002
+++ cl/src/Makefile.in Sat Sep 7 18:23:12 2002
@@ -135,6 +135,7 @@ INCLUDES = \
$OpenBSD: patch-cl_src_Makefile_in,v 1.2 2003/07/12 06:24:49 marcm Exp $
--- cl/src/Makefile.in.orig Sun Jun 15 15:58:30 2003
+++ cl/src/Makefile.in Sun Jun 15 15:59:11 2003
@@ -150,6 +150,7 @@ INCLUDES = \
LDADD = \
$(XML_LIBS) \
$(XSLT_LIBS) \
@ -9,12 +9,3 @@ $OpenBSD: patch-cl_src_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
$(top_builddir)/libs/libscrollkeeper.la
@@ -170,7 +171,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L$(top_builddir)/libs/.libs @LDFLAGS@
LIBS = @LIBS@
scrollkeeper_preinstall_OBJECTS = preinstall.$(OBJEXT)
scrollkeeper_preinstall_LDADD = $(LDADD)

148
textproc/scrollkeeper/patches/patch-configure
View File

@ -1,134 +1,36 @@
$OpenBSD: patch-configure,v 1.2 2002/11/30 04:41:29 marcm Exp $
--- configure.orig Wed Jul 24 19:26:07 2002
+++ configure Mon Sep 9 12:46:15 2002
@@ -28,6 +28,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset
*-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;;
esac
+ PATH_SEPARATOR=$lt_cv_sys_path_separator
fi
@@ -1959,6 +1960,16 @@ newos6*)
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
+openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
# this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -2724,7 +2735,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.
@@ -3221,7 +3239,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -3625,10 +3645,24 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
$OpenBSD: patch-configure,v 1.3 2003/07/12 06:24:49 marcm Exp $
--- configure.orig Wed Jan 22 22:12:13 2003
+++ configure Mon Jun 16 09:26:11 2003
@@ -5462,7 +5462,7 @@ else
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
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 $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -4105,9 +4139,22 @@ 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"
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -6279,7 +6326,7 @@ case "$host_os" in
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -5472,7 +5472,7 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
@@ -8795,7 +8795,7 @@ case "$host_os" in
*)
echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6
echo "configure:6282: checking for docbook-dtd412-xml" >&5
echo "$as_me:$LINENO: checking for docbook-dtd412-xml" >&5
echo $ECHO_N "checking for docbook-dtd412-xml... $ECHO_C" >&6
- if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
+ if xmlcatalog $(eval echo ${datadir})/xml/docbook/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
+ if xmlcatalog /var/db/xmlcatalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
echo "* ERROR * "
echo " "
echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
@@ -6826,6 +6873,10 @@ echo "$ac_t""$gt_cv_func_gnugettext1_lib
#define HAVE_GETTEXT 1
EOF
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
INTLLIBS="-lintl $LIBICONV"
@@ -7325,7 +7376,7 @@ fi
echo "$ac_t""setting up partial database directory ..." 1>&6
@@ -11516,7 +11516,7 @@ fi
echo "$as_me:$LINENO: result: setting up partial database directory ..." >&5
echo "${ECHO_T}setting up partial database directory ..." >&6
case "$host_os" in
- freebsd*)
+ freebsd*|openbsd*)

12
textproc/scrollkeeper/patches/patch-doc_writing_scrollkeeper_omf_files_C_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_writing_scrollkeeper_omf_files_C_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- doc/writing_scrollkeeper_omf_files/C/Makefile.in.orig Sat Jun 1 08:17:42 2002
+++ doc/writing_scrollkeeper_omf_files/C/Makefile.in Wed Jul 24 12:31:57 2002
@@ -299,7 +299,7 @@ omf: omf_timestamp
omf_timestamp: $(omffile)
-for file in $(omffile); do \
- $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \
+ LD_PRELOAD=$(top_builddir)/libs/.libs/libscrollkeeper.so.1.0 $(top_builddir)/cl/src/scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \
done
touch omf_timestamp

25
textproc/scrollkeeper/patches/patch-extract_dtds_Makefile_in
View File

@ -1,13 +1,22 @@
$OpenBSD: patch-extract_dtds_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- extract/dtds/Makefile.in.orig Sun Sep 8 16:53:19 2002
+++ extract/dtds/Makefile.in Sun Sep 8 17:00:14 2002
@@ -282,9 +282,6 @@ install-data-hook:
#
$OpenBSD: patch-extract_dtds_Makefile_in,v 1.2 2003/07/12 06:24:49 marcm Exp $
--- extract/dtds/Makefile.in.orig Wed Jan 22 22:12:02 2003
+++ extract/dtds/Makefile.in Sun Jun 15 10:13:26 2003
@@ -138,7 +138,7 @@ XSLT_LIBS = @XSLT_LIBS@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
-CATALOG = $(sysconfdir)/xml/catalog
+CATALOG = /var/db/xmlcatalog
dtdsdir = $(datadir)/xml/scrollkeeper/dtds
dtds_HEADERS = scrollkeeper-omf.dtd scrollkeeper-cl.dtd
subdir = extract/dtds
@@ -335,9 +335,6 @@ uninstall-am: uninstall-dtdsHEADERS unin
# ScrollKeeper OMF Variation DTD V1.0
# ScrollKeeper OMF Variation DTD V1.0
install-data-hook:
- -/usr/bin/xmlcatalog --noout --add "public" \
- "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
- "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG)
uninstall-local:
#
#
# Unregister the DTD(s) in the system XML Catalog

19
textproc/scrollkeeper/patches/patch-extract_src_Makefile_in
View File

@ -1,20 +1,11 @@
$OpenBSD: patch-extract_src_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- extract/src/Makefile.in.orig Wed Jul 24 19:27:41 2002
+++ extract/src/Makefile.in Sat Sep 7 18:26:19 2002
@@ -136,6 +136,7 @@ INCLUDES = \
$OpenBSD: patch-extract_src_Makefile_in,v 1.2 2003/07/12 06:24:49 marcm Exp $
--- extract/src/Makefile.in.orig Sun Jun 15 16:01:07 2003
+++ extract/src/Makefile.in Sun Jun 15 16:01:35 2003
@@ -150,6 +150,7 @@ INCLUDES = \
LDADD = \
$(XML_LIBS) \
$(XSLT_LIBS) \
+ $(INTLLIBS) \
+ $(INTLLIBS) \
$(top_builddir)/libs/libscrollkeeper.la
@@ -153,7 +154,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -L$(top_builddir)/libs/.libs @LDFLAGS@
LIBS = @LIBS@
scrollkeeper_extract_OBJECTS = scrollkeeper-extract.$(OBJEXT)
scrollkeeper_extract_LDADD = $(LDADD)

22
textproc/scrollkeeper/patches/patch-libs_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-libs_Makefile_in,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- libs/Makefile.in.orig Sat Jun 1 08:17:00 2002
+++ libs/Makefile.in Wed Jul 24 12:30:40 2002
@@ -259,7 +259,7 @@ distclean-libtool:
maintainer-clean-libtool:
libscrollkeeper.la: $(libscrollkeeper_la_OBJECTS) $(libscrollkeeper_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libscrollkeeper_la_LDFLAGS) $(libscrollkeeper_la_OBJECTS) $(libscrollkeeper_la_LIBADD) $(LIBS)
+ $(LINK) -version-info 1:0 -rpath $(libdir) $(libscrollkeeper_la_LDFLAGS) $(libscrollkeeper_la_OBJECTS) $(libscrollkeeper_la_LIBADD) $(LIBS)
tags: TAGS
$OpenBSD: patch-libs_Makefile_in,v 1.2 2003/07/12 06:24:49 marcm Exp $
--- libs/Makefile.in.orig Wed Jan 22 22:12:05 2003
+++ libs/Makefile.in Sun Jun 15 16:25:31 2003
@@ -167,7 +167,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = scrollkeeper.h
LTLIBRARIES = $(lib_LTLIBRARIES)
-libscrollkeeper_la_LDFLAGS =
+libscrollkeeper_la_LDFLAGS = -version-info 1:0
libscrollkeeper_la_DEPENDENCIES =
am_libscrollkeeper_la_OBJECTS = error.lo file.lo i18n.lo merge.lo \
extract.lo install.lo database.lo uninstall.lo update-url.lo

13
textproc/scrollkeeper/patches/patch-libs_database_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-libs_database_c,v 1.1 2002/11/30 04:41:29 marcm Exp $
--- libs/database.c.orig Tue Sep 10 11:53:51 2002
+++ libs/database.c Tue Sep 10 11:56:45 2002
@@ -131,7 +131,8 @@ int create_database_directory(char *scro
/* create locale directories and symlinks */
- dir = opendir(data_dir);
+ if ((dir = opendir(data_dir)) == NULL)
+ return;
while((dir_ent = readdir(dir)) != NULL)
{

25
textproc/scrollkeeper/patches/patch-libs_i18n_c Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-libs_i18n_c,v 1.1 2003/07/12 06:24:49 marcm Exp $
--- libs/i18n.c.orig Sun Jun 15 20:21:29 2003
+++ libs/i18n.c Sun Jun 15 20:21:32 2003
@@ -38,6 +38,21 @@ enum {
* All rights reserved.
*/
+/* Well, of course the whole world uses glibc... */
+static char *
+strndup(const char *str, int len) {
+ char *ret;
+
+ if ((str == NULL || len < 0))
+ return(NULL);
+ ret = (char *)malloc(len + 1);
+ if (ret == NULL)
+ return(NULL);
+ memcpy(ret, str, len);
+ ret[len] = '\0';
+ return(ret);
+}
+
/* Support function for compute_locale_variants. */
static int explode_locale(const char *locale, char **language,
char **territory, char **codeset, char **modifier)

14
textproc/scrollkeeper/patches/patch-ltmain_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/28 21:37:04 sturm Exp $
--- ltmain.sh.orig Thu Jul 25 04:25:36 2002
+++ ltmain.sh Sat Jun 28 19:38:39 2003
@@ -1037,6 +1037,17 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.3 2003/07/12 06:24:49 marcm Exp $
--- ltmain.sh.orig Wed Jan 22 22:11:19 2003
+++ ltmain.sh Sun Jun 29 20:34:12 2003
@@ -1073,6 +1073,17 @@ compiler."
continue
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/06/28 21:37:04 sturm Exp $
-module)
module=yes
continue
@@ -1473,6 +1484,9 @@ compiler."
@@ -1530,6 +1541,9 @@ compiler."
fi
continue
;;
@ -29,9 +29,9 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/06/28 21:37:04 sturm Exp $
%DEPLIBS%)
alldeplibs=yes
continue
@@ -4412,40 +4426,6 @@ relink_command=\"$relink_command\""
@@ -4526,40 +4540,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"

44
textproc/scrollkeeper/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2002/11/30 04:41:29 marcm Exp $
@comment $OpenBSD: PLIST,v 1.4 2003/07/12 06:24:49 marcm Exp $
bin/scrollkeeper-config
bin/scrollkeeper-extract
bin/scrollkeeper-gen-seriesid
@ -22,10 +22,12 @@ man/man7/scrollkeeper.7
man/man8/scrollkeeper-preinstall.8
man/man8/scrollkeeper-rebuilddb.8
man/man8/scrollkeeper-update.8
@comment share/doc/scrollkeeper-0.3.11/COPYING-DOCS
@comment share/doc/scrollkeeper-0.3.12/COPYING-DOCS
share/examples/scrollkeeper/scrollkeeper.conf
share/locale/az/LC_MESSAGES/scrollkeeper.mo
share/locale/be/LC_MESSAGES/scrollkeeper.mo
share/locale/ca/LC_MESSAGES/scrollkeeper.mo
share/locale/cs/LC_MESSAGES/scrollkeeper.mo
share/locale/da/LC_MESSAGES/scrollkeeper.mo
share/locale/de/LC_MESSAGES/scrollkeeper.mo
share/locale/el/LC_MESSAGES/scrollkeeper.mo
@ -35,11 +37,11 @@ share/locale/hu/LC_MESSAGES/scrollkeeper.mo
share/locale/it/LC_MESSAGES/scrollkeeper.mo
share/locale/ja/LC_MESSAGES/scrollkeeper.mo
share/locale/ko/LC_MESSAGES/scrollkeeper.mo
share/locale/nb/LC_MESSAGES/scrollkeeper.mo
share/locale/nl/LC_MESSAGES/scrollkeeper.mo
share/locale/no/LC_MESSAGES/scrollkeeper.mo
share/locale/pl/LC_MESSAGES/scrollkeeper.mo
share/locale/pt_BR/LC_MESSAGES/scrollkeeper.mo
share/locale/ro/LC_MESSAGES/scrollkeeper.mo
share/locale/ru/LC_MESSAGES/scrollkeeper.mo
share/locale/sk/LC_MESSAGES/scrollkeeper.mo
share/locale/sl/LC_MESSAGES/scrollkeeper.mo
@ -47,37 +49,40 @@ share/locale/sv/LC_MESSAGES/scrollkeeper.mo
share/locale/tr/LC_MESSAGES/scrollkeeper.mo
share/locale/uk/LC_MESSAGES/scrollkeeper.mo
share/locale/vi/LC_MESSAGES/scrollkeeper.mo
share/locale/zh_CN/LC_MESSAGES/scrollkeeper.mo
share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
share/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
share/scrollkeeper/Templates/C/scrollkeeper_cl.xml
share/scrollkeeper/Templates/be/scrollkeeper_cl.xml
share/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
share/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
share/scrollkeeper/Templates/da/scrollkeeper_cl.xml
share/scrollkeeper/Templates/de/scrollkeeper_cl.xml
share/scrollkeeper/Templates/el/scrollkeeper_cl.xml
share/scrollkeeper/Templates/es/scrollkeeper_cl.xml
share/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
share/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
share/scrollkeeper/Templates/it/scrollkeeper_cl.xml
share/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
share/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
share/scrollkeeper/Templates/nb/scrollkeeper_cl.xml
share/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
share/scrollkeeper/Templates/no/scrollkeeper_cl.xml
share/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
share/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
share/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
share/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
share/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
share/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
share/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
share/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
share/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
share/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
share/scrollkeeper/stylesheets/categories.xsl
share/scrollkeeper/stylesheets/index.xsl
share/scrollkeeper/stylesheets/toc.xsl
share/xml/catalog.scrollkeeper
share/xml/docbook.scrollkeeper
share/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
%%SHARED%%
@ -89,30 +94,30 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files
@dirrm share/scrollkeeper/doc
@dirrm share/scrollkeeper/Templates/zh_TW
@dirrm share/scrollkeeper/Templates/zh_CN
@dirrm share/scrollkeeper/Templates/vi
@comment @exec mkdir -p %D/share/scrollkeeper/Templates/uk
@comment @dirrm share/scrollkeeper/Templates/uk
@dirrm share/scrollkeeper/Templates/tr
@dirrm share/scrollkeeper/Templates/sv
@dirrm share/scrollkeeper/Templates/sl
@dirrm share/scrollkeeper/Templates/sk
@dirrm share/scrollkeeper/Templates/ru
@dirrm share/scrollkeeper/Templates/ro
@dirrm share/scrollkeeper/Templates/pt_BR
@dirrm share/scrollkeeper/Templates/pl
@dirrm share/scrollkeeper/Templates/no
@dirrm share/scrollkeeper/Templates/nl
@dirrm share/scrollkeeper/Templates/nb
@dirrm share/scrollkeeper/Templates/ko
@dirrm share/scrollkeeper/Templates/ja
@dirrm share/scrollkeeper/Templates/it
@dirrm share/scrollkeeper/Templates/hu
@comment @exec mkdir -p %D/share/scrollkeeper/Templates/fr
@comment @dirrm share/scrollkeeper/Templates/fr
@dirrm share/scrollkeeper/Templates/fr
@dirrm share/scrollkeeper/Templates/es
@dirrm share/scrollkeeper/Templates/el
@dirrm share/scrollkeeper/Templates/de
@dirrm share/scrollkeeper/Templates/da
@dirrm share/scrollkeeper/Templates/cs
@dirrm share/scrollkeeper/Templates/ca
@dirrm share/scrollkeeper/Templates/be
@dirrm share/scrollkeeper/Templates/C
@dirrm share/scrollkeeper/Templates
@dirrm share/scrollkeeper
@ -120,6 +125,8 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
@dirrm share/omf
@comment @dirrm share/locale/zh_TW/LC_MESSAGES
@comment @dirrm share/locale/zh_TW
@comment @dirrm share/locale/zh_CN/LC_MESSAGES
@comment @dirrm share/locale/zh_CN
@comment @dirrm share/locale/vi/LC_MESSAGES
@comment @dirrm share/locale/vi
@comment @dirrm share/locale/uk/LC_MESSAGES
@ -134,6 +141,8 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
@comment @dirrm share/locale/sk
@comment @dirrm share/locale/ru/LC_MESSAGES
@comment @dirrm share/locale/ru
@comment @dirrm share/locale/ro/LC_MESSAGES
@comment @dirrm share/locale/ro
@comment @dirrm share/locale/pt_BR/LC_MESSAGES
@comment @dirrm share/locale/pt_BR
@comment @dirrm share/locale/pl/LC_MESSAGES
@ -142,8 +151,6 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
@comment @dirrm share/locale/no
@comment @dirrm share/locale/nl/LC_MESSAGES
@comment @dirrm share/locale/nl
@comment @dirrm share/locale/nb/LC_MESSAGES
@comment @dirrm share/locale/nb
@comment @dirrm share/locale/ko/LC_MESSAGES
@comment @dirrm share/locale/ko
@comment @dirrm share/locale/ja/LC_MESSAGES
@ -162,12 +169,17 @@ share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
@comment @dirrm share/locale/de
@comment @dirrm share/locale/da/LC_MESSAGES
@comment @dirrm share/locale/da
@comment @dirrm share/locale/cs/LC_MESSAGES
@comment @dirrm share/locale/cs
@comment @dirrm share/locale/ca/LC_MESSAGES
@comment @dirrm share/locale/ca
@comment @dirrm share/locale/be/LC_MESSAGES
@comment @dirrm share/locale/be
@comment @dirrm share/locale/az/LC_MESSAGES
@comment @dirrm share/locale/az
@comment @dirrm share/locale
@dirrm share/examples/scrollkeeper
@comment @dirrm share/doc/scrollkeeper-0.3.11
@exec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-rebuilddb -q
@exec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-update -q
@comment @dirrm share/doc/scrollkeeper-0.3.12
@exec %D/bin/xmlcatalog --noout --add "public" "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "file://%D/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" /var/db/xmlcatalog
@exec %D/bin/scrollkeeper-rebuilddb -q
@unexec xmlcatalog --noout --del "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" /var/db/xmlcatalog