Update for Gnome 2.2.1.
ok jolan@
This commit is contained in:
marcm
parent
472f8b99cc
commit
e7e9c2a60d
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2003/01/31 18:56:47 todd Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2003/06/12 20:21:06 marcm Exp $
|
||||
|
||||
COMMENT= "lightweight HTML rendering/printing/editing engine"
|
||||
|
||||
DISTNAME= libgtkhtml-2.0.3
|
||||
DISTNAME= libgtkhtml-2.2.1
|
||||
CATEGORIES= x11/gnome
|
||||
|
||||
HOMEPAGE= http://www.gnome.org/
|
||||
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.0/}
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.2/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
BUILD_DEPENDS= :pkgconfig->=0.14.0p1:devel/pkgconfig
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (libgtkhtml-2.0.3.tar.bz2) = 692e789c4d1679f495d9a76ea4db420f
|
||||
RMD160 (libgtkhtml-2.0.3.tar.bz2) = 0baa9b8176b36cc6b96eacf141ed45b632313ee3
|
||||
SHA1 (libgtkhtml-2.0.3.tar.bz2) = fa5fb789ff153febe23bfc2bb47b9d73d851198d
|
||||
MD5 (libgtkhtml-2.2.1.tar.bz2) = afce0ccf5dfdb51e11fca830367f85e4
|
||||
RMD160 (libgtkhtml-2.2.1.tar.bz2) = 88d135600874567334b2e7cdba6bf12584743e30
|
||||
SHA1 (libgtkhtml-2.2.1.tar.bz2) = 5c7528745825626e9263ca9ae5f09ef0a5623e10
|
||||
|
||||
@ -1,25 +1,109 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2003/01/31 18:56:47 todd Exp $
|
||||
--- configure.orig Mon Nov 18 14:05:25 2002
|
||||
+++ configure Wed Nov 27 23:21:46 2002
|
||||
@@ -5211,8 +5211,8 @@ else
|
||||
$OpenBSD: patch-configure,v 1.2 2003/06/12 20:21:06 marcm Exp $
|
||||
--- configure.orig Sat May 31 06:26:55 2003
|
||||
+++ configure Sat May 31 06:34:04 2003
|
||||
@@ -3250,6 +3250,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'
|
||||
@@ -4151,8 +4161,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
|
||||
old_postuninstall_cmds=
|
||||
|
||||
if test -n "$RANLIB"; then
|
||||
+ case $host_os in
|
||||
+ openbsd*)
|
||||
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ esac
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
fi
|
||||
|
||||
# Allow CC to be a program name with arguments.
|
||||
@@ -4732,7 +4749,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
|
||||
extract_expsyms_cmds=
|
||||
|
||||
case $host_os in
|
||||
-cygwin* | mingw* | pw32* )
|
||||
+cygwin* | mingw* | pw32*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -4740,7 +4757,9 @@ cygwin* | mingw* | pw32* )
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
-
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -5144,10 +5163,24 @@ 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
|
||||
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'
|
||||
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ 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 $compiler_flags'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
case "$host_os" in
|
||||
@@ -5221,8 +5221,8 @@ else
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='${wl}-rpath,$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
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -5628,9 +5661,21 @@ 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 -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ 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'
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:56:47 todd Exp $
|
||||
--- ltmain.sh.orig Mon Aug 19 18:13:37 2002
|
||||
+++ ltmain.sh Wed Nov 27 23:21:46 2002
|
||||
@@ -1073,6 +1073,17 @@ compiler."
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 20:21:06 marcm Exp $
|
||||
--- ltmain.sh.orig Wed Apr 17 06:06:13 2002
|
||||
+++ ltmain.sh Sat May 31 06:26:55 2003
|
||||
@@ -1037,6 +1037,17 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:56:47 todd Exp $
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1530,6 +1541,9 @@ compiler."
|
||||
@@ -1473,6 +1484,9 @@ compiler."
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
@ -29,9 +29,9 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:56:47 todd Exp $
|
||||
%DEPLIBS%)
|
||||
alldeplibs=yes
|
||||
continue
|
||||
@@ -4526,40 +4540,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -4412,40 +4426,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:"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user