From d1b4f500d93bd9e3871e71096a437830b73f696f Mon Sep 17 00:00:00 2001 From: sturm Date: Sat, 31 Dec 2005 14:35:36 +0000 Subject: [PATCH] SHARED_LIBS, USE_LIBTOOL --- www/gtkhtml/Makefile | 8 ++- www/gtkhtml/patches/patch-ltmain_sh | 72 ------------------------ www/gtkhtml/pkg/PFRAG.shared | 4 +- www/gtkhtml3/Makefile | 8 ++- www/gtkhtml3/patches/patch-ltmain_sh | 70 ----------------------- www/gtkhtml3/pkg/PFRAG.shared | 5 +- www/libghttp/Makefile | 9 ++- www/libghttp/patches/patch-ltconfig | 81 --------------------------- www/libghttp/patches/patch-ltmain.sh | 83 ---------------------------- www/libghttp/pkg/PFRAG.shared | 4 +- 10 files changed, 26 insertions(+), 318 deletions(-) delete mode 100644 www/gtkhtml/patches/patch-ltmain_sh delete mode 100644 www/gtkhtml3/patches/patch-ltmain_sh delete mode 100644 www/libghttp/patches/patch-ltconfig delete mode 100644 www/libghttp/patches/patch-ltmain.sh diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 6aa2a40f46f..ce5f3712976 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.10 2005/01/30 11:23:14 alek Exp $ +# $OpenBSD: Makefile,v 1.11 2005/12/31 14:35:36 sturm Exp $ COMMENT= "lightweight HTML rendering/printing/editing engine" DISTNAME= gtkhtml-1.1.10 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= www +SHARED_LIBS= gtkhtml-1.1 3.5 +MODGNU_SHARED_LIBS= gtkhtml-1.1 '' + HOMEPAGE= http://www.gnome.org/ MAINTAINER= Marc Matteo @@ -34,6 +37,7 @@ LIB_DEPENDS= bonobo.2,bonobox.2::x11/gnome/bonobo \ USE_X11= Yes USE_GMAKE= Yes +USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} diff --git a/www/gtkhtml/patches/patch-ltmain_sh b/www/gtkhtml/patches/patch-ltmain_sh deleted file mode 100644 index 52cde4f77dc..00000000000 --- a/www/gtkhtml/patches/patch-ltmain_sh +++ /dev/null @@ -1,72 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.4 2003/04/10 15:55:48 marcm Exp $ ---- ltmain.sh.orig Mon Mar 31 10:06:29 2003 -+++ ltmain.sh Fri Apr 4 10:34:29 2003 -@@ -1073,6 +1073,17 @@ compiler." - continue - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1534,6 +1545,9 @@ compiler." - alldeplibs=yes - continue - ;; -+ -pthread) -+ continue -+ ;; - esac # case $deplib - if test $found = yes || test -f "$lib"; then : - else -@@ -4526,40 +4540,6 @@ relink_command=\"$relink_command\"" - # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/www/gtkhtml/pkg/PFRAG.shared b/www/gtkhtml/pkg/PFRAG.shared index 8a5dca16410..26130ad27fe 100644 --- a/www/gtkhtml/pkg/PFRAG.shared +++ b/www/gtkhtml/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/15 18:49:49 espie Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/31 14:35:36 sturm Exp $ lib/bonobo/plugin/libstorage_http.so -@lib lib/libgtkhtml-1.1.so.3.5 +@lib lib/libgtkhtml-1.1.so.${LIBgtkhtml-1.1_VERSION} diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index d1771e025b2..5593ec82f3c 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -1,11 +1,14 @@ -# $OpenBSD: Makefile,v 1.2 2005/11/13 16:58:08 marcm Exp $ +# $OpenBSD: Makefile,v 1.3 2005/12/31 14:35:36 sturm Exp $ COMMENT= "lightweight HTML rendering/printing/editing engine" VERSION= 3.6.2 DISTNAME= gtkhtml-${VERSION} -PKGNAME= gtkhtml3-${VERSION}p0 +PKGNAME= gtkhtml3-${VERSION}p1 CATEGORIES= www +SHARED_LIBS= gtkhtml-${API_VERSION} 18.2 +MODGNU_SHARED_LIBS= gtkhtml-${API_VERSION} '' + HOMEPAGE= http://www.gnome.org/ MAINTAINER= Marc Matteo @@ -38,6 +41,7 @@ LIB_DEPENDS= gailutil::x11/gnome/gail \ USE_X11= Yes USE_GMAKE= Yes +USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} diff --git a/www/gtkhtml3/patches/patch-ltmain_sh b/www/gtkhtml3/patches/patch-ltmain_sh deleted file mode 100644 index c9ea41078e4..00000000000 --- a/www/gtkhtml3/patches/patch-ltmain_sh +++ /dev/null @@ -1,70 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2005/05/24 22:12:39 marcm Exp $ ---- ltmain.sh.orig Fri Oct 1 16:15:46 2004 -+++ ltmain.sh Tue Apr 5 23:05:13 2005 -@@ -1975,9 +1975,12 @@ EOF - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -+ continue - fi -+ if test "$linkmode" = "lib"; then -+ newdependency_libs="$deplib $newdependency_libs" -+ fi -+ deplibs="$deplib $deplibs" - continue - ;; - -l*) -@@ -2414,10 +2417,6 @@ EOF - link_static=no # Whether the deplib will be linked statically - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -- if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -- fi - # This is a shared library - - # Warn about portability, can't link against -module's on -@@ -5804,40 +5803,6 @@ relink_command=\"$relink_command\"" - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS - -- $echo "----------------------------------------------------------------------" -- $echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $echo " $libdir" -- done -- $echo -- $echo "If you ever happen to want to link against installed libraries" -- $echo "in a given directory, LIBDIR, you must either use libtool, and" -- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $echo " during execution" -- fi -- if test -n "$runpath_var"; then -- $echo " - add LIBDIR to the \`$runpath_var' environment variable" -- $echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- $echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- $echo -- $echo "See any operating system documentation about shared libraries for" -- $echo "more information, such as the ld(1) and ld.so(8) manual pages." -- $echo "----------------------------------------------------------------------" - exit $EXIT_SUCCESS - ;; - diff --git a/www/gtkhtml3/pkg/PFRAG.shared b/www/gtkhtml3/pkg/PFRAG.shared index eb670a71424..c81585677ad 100644 --- a/www/gtkhtml3/pkg/PFRAG.shared +++ b/www/gtkhtml3/pkg/PFRAG.shared @@ -1,3 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/05/24 22:12:39 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/31 14:35:36 sturm Exp $ lib/gtkhtml/libgnome-gtkhtml-editor-${API_VERSION}.so -@lib lib/libgtkhtml-${API_VERSION}.so.18.2 +@comment XXX pkg_create does not deal with nested variables +@lib lib/libgtkhtml-${API_VERSION}.so.${LIBgtkhtml-3.6_VERSION} diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile index 9e2ab35601a..a6771a84543 100644 --- a/www/libghttp/Makefile +++ b/www/libghttp/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.16 2005/08/17 16:10:05 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2005/12/31 14:35:36 sturm Exp $ COMMENT= "GNOME http client library" DISTNAME= libghttp-1.0.9 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= www +SHARED_LIBS= ghttp 1.0 +MODGNU_SHARED_LIBS=ghttp '' + MASTER_SITES= $(MASTER_SITE_GNOME:=sources/libghttp/1.0/) # GPL @@ -13,6 +16,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +USE_LIBTOOL= Yes + SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} diff --git a/www/libghttp/patches/patch-ltconfig b/www/libghttp/patches/patch-ltconfig deleted file mode 100644 index 24ed6789c77..00000000000 --- a/www/libghttp/patches/patch-ltconfig +++ /dev/null @@ -1,81 +0,0 @@ -$OpenBSD: patch-ltconfig,v 1.5 2001/09/18 20:48:03 naddy Exp $ ---- ltconfig.orig Fri Jan 5 23:04:40 2001 -+++ ltconfig Tue Sep 18 22:43:49 2001 -@@ -501,7 +501,14 @@ fi - - 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 - - # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. -@@ -1105,7 +1112,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -1402,10 +1411,21 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd[01].* | 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}-rpath,$libdir' -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -2021,9 +2041,23 @@ netbsd*) - - 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 -+ 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-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 -+ 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' diff --git a/www/libghttp/patches/patch-ltmain.sh b/www/libghttp/patches/patch-ltmain.sh deleted file mode 100644 index 6086bbf793f..00000000000 --- a/www/libghttp/patches/patch-ltmain.sh +++ /dev/null @@ -1,83 +0,0 @@ -$OpenBSD: patch-ltmain.sh,v 1.4 2001/09/18 20:48:03 naddy Exp $ ---- ltmain.sh.orig Fri Jan 5 23:04:41 2001 -+++ ltmain.sh Tue Sep 18 22:43:54 2001 -@@ -1079,6 +1079,17 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ continue -+ ;; -+ esac -+ elif test "$arg" = "-lc_r"; then -+ case "$host" in -+ *-*-openbsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; - esac - elif test "$arg" = "-lm"; then - case "$host" in -@@ -1091,6 +1102,10 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ - -module) - module=yes - continue -@@ -1795,6 +1810,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; - *-*-rhapsody*) - # rhapsody is a little odd... - deplibs="$deplibs -framework System" -@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/www/libghttp/pkg/PFRAG.shared b/www/libghttp/pkg/PFRAG.shared index 158c44e378f..feb5860eb3f 100644 --- a/www/libghttp/pkg/PFRAG.shared +++ b/www/libghttp/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:49:49 espie Exp $ -@lib lib/libghttp.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/31 14:35:36 sturm Exp $ +@lib lib/libghttp.so.${LIBghttp_VERSION}