diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 41d6a425422..f2d12278dce 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2001/09/28 06:02:13 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.6 2001/10/24 12:54:37 shell Exp $ COMMENT= "callback framework for C++" -DISTNAME= libsigc++-1.0.3 +DISTNAME= libsigc++-1.0.4 CATEGORIES= devel -NEED_VERSION= 1.414 +NEED_VERSION= 1.481 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= libsigc @@ -19,14 +19,10 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/scripts -DOCFILE= API FAQ UML conventions diagrams marshal \ - powerusers requirements riscos signals -DOCDIR= ${PREFIX}/share/doc/libsigc++ +DOCDIR= ${PREFIX}/share/doc/libsigc++/ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} -.for i in ${DOCFILE} - ${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCDIR}/$i -.endfor + ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCDIR} .include diff --git a/devel/libsigc++/files/md5 b/devel/libsigc++/files/md5 index d9104e0cfc2..0019f24e9e0 100644 --- a/devel/libsigc++/files/md5 +++ b/devel/libsigc++/files/md5 @@ -1,3 +1,3 @@ -MD5 (libsigc++-1.0.3.tar.gz) = a7e0f529bc49fdcc097108a48c55796d -RMD160 (libsigc++-1.0.3.tar.gz) = 72eb1e10068cc8842551838acc080cc7d5155c4b -SHA1 (libsigc++-1.0.3.tar.gz) = 22f08c9170a0f2f30d49c34a140fa8069dabe44f +MD5 (libsigc++-1.0.4.tar.gz) = 88d34840acc1cc5d47b347726e4a09e0 +RMD160 (libsigc++-1.0.4.tar.gz) = b750a5b6cd75fbb7288c6e35d8f3abad9f641722 +SHA1 (libsigc++-1.0.4.tar.gz) = 15a687edc5f64a317ef40f4df04dc5adeccfb88d diff --git a/devel/libsigc++/patches/patch-scripts_ltconfig b/devel/libsigc++/patches/patch-scripts_ltconfig index 681fa3bf951..f8deca39317 100644 --- a/devel/libsigc++/patches/patch-scripts_ltconfig +++ b/devel/libsigc++/patches/patch-scripts_ltconfig @@ -1,18 +1,34 @@ -$OpenBSD: patch-scripts_ltconfig,v 1.1 2001/06/20 11:14:16 shell Exp $ ---- scripts/ltconfig.orig Wed Jun 20 17:01:47 2001 -+++ scripts/ltconfig Wed Jun 20 17:07:08 2001 -@@ -1105,7 +1105,9 @@ +$OpenBSD: patch-scripts_ltconfig,v 1.2 2001/10/24 12:54:37 shell Exp $ +--- scripts/ltconfig.orig Fri Jul 14 05:54:59 2000 ++++ scripts/ltconfig Wed Oct 24 18:25:44 2001 +@@ -501,7 +501,14 @@ + + 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 @@ with_gnu_ld=no fi ;; - +openbsd*) -+ with_gnu_ld=no ++ with_gnu_ld=no + ;; esac ld_shlibs=yes -@@ -1402,10 +1404,21 @@ +@@ -1402,10 +1411,24 @@ ;; openbsd*) @@ -20,34 +36,51 @@ $OpenBSD: patch-scripts_ltconfig,v 1.1 2001/06/20 11:14:16 shell Exp $ - hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -+ case "$host_os" in ++ 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 + 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='$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 [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-R$libdir' ++ ;; ++ esac ++ fi ;; os2*) -@@ -2022,13 +2035,10 @@ +@@ -2021,9 +2044,25 @@ openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no -- fi ++ 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-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' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/devel/libsigc++/patches/patch-scripts_ltmain b/devel/libsigc++/patches/patch-scripts_ltmain index b0dcbcd0b70..25a8d858939 100644 --- a/devel/libsigc++/patches/patch-scripts_ltmain +++ b/devel/libsigc++/patches/patch-scripts_ltmain @@ -1,38 +1,53 @@ -$OpenBSD: patch-scripts_ltmain,v 1.1 2001/06/20 11:14:17 shell Exp $ ---- scripts/ltmain.sh.orig Wed Jun 20 17:07:35 2001 -+++ scripts/ltmain.sh Wed Jun 20 17:12:10 2001 -@@ -1079,6 +1079,9 @@ +$OpenBSD: patch-scripts_ltmain,v 1.2 2001/10/24 12:54:37 shell Exp $ +--- scripts/ltmain.sh.orig Fri Jul 14 05:54:59 2000 ++++ scripts/ltmain.sh Wed Oct 24 18:25:51 2001 +@@ -1079,6 +1079,17 @@ # 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 -@@ -1103,6 +1106,10 @@ +@@ -1091,6 +1102,17 @@ + deplibs="$deplibs $arg" + ;; - -o) prev=output ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; ++ -pthread) ++ case $host in ++ *-*-openbsd*) ++ deplibs="$deplibs $arg" ++ ;; ++ *) ++ continue ++ ;; ++ esac ++ ;; + - -release) - prev=release + -module) + module=yes continue -@@ -1799,6 +1806,9 @@ - # rhapsody is a little odd... - deplibs="$deplibs -framework System" +@@ -1795,6 +1817,9 @@ + *-*-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 ? ++ # Do not include libc due to us having libc/libc_r. + ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3567,40 +3577,6 @@ + *-*-rhapsody*) + # rhapsody is a little odd... + deplibs="$deplibs -framework System" +@@ -3571,40 +3596,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 diff --git a/devel/libsigc++/patches/patch-sigc++_Makefile_am b/devel/libsigc++/patches/patch-sigc++_Makefile_am index 2e0f58c4256..103a8f01c29 100644 --- a/devel/libsigc++/patches/patch-sigc++_Makefile_am +++ b/devel/libsigc++/patches/patch-sigc++_Makefile_am @@ -1,12 +1,12 @@ -$OpenBSD: patch-sigc++_Makefile_am,v 1.1 2001/07/20 20:59:33 shell Exp $ ---- sigc++/Makefile.am.orig Fri Jul 20 14:15:02 2001 -+++ sigc++/Makefile.am Fri Jul 20 14:15:29 2001 -@@ -13,7 +13,7 @@ libsigc_la_SOURCES= \ - basic_signal.cc adaptor.cc thread.cc +$OpenBSD: patch-sigc++_Makefile_am,v 1.2 2001/10/24 12:54:37 shell Exp $ +--- sigc++/Makefile.am.orig Wed Oct 24 18:32:01 2001 ++++ sigc++/Makefile.am Wed Oct 24 18:32:11 2001 +@@ -14,7 +14,7 @@ + EXTRA_libsigc_la_SOURCES = sigc_res.rc libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION) \ - -release $(SIGC_RELEASE) -no-undefined + -no-undefined - libsigcdir=$(prefix)/include/sigc++ lib_LTLIBRARIES = libsigc.la + diff --git a/devel/libsigc++/patches/patch-sigc++_Makefile_in b/devel/libsigc++/patches/patch-sigc++_Makefile_in index e094bca677a..7cc644de925 100644 --- a/devel/libsigc++/patches/patch-sigc++_Makefile_in +++ b/devel/libsigc++/patches/patch-sigc++_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-sigc++_Makefile_in,v 1.1 2001/07/20 20:59:33 shell Exp $ ---- sigc++/Makefile.in.orig Fri Jul 20 14:14:58 2001 -+++ sigc++/Makefile.in Fri Jul 20 14:15:17 2001 -@@ -90,7 +90,7 @@ BUILT_SOURCES = slot.h object_slot.h fun - libsigc_la_SOURCES = object.cc scope.cc marshal.cc slot.cc basic_signal.cc adaptor.cc thread.cc +$OpenBSD: patch-sigc++_Makefile_in,v 1.2 2001/10/24 12:54:37 shell Exp $ +--- sigc++/Makefile.in.orig Wed Oct 24 18:32:52 2001 ++++ sigc++/Makefile.in Wed Oct 24 18:33:04 2001 +@@ -94,7 +94,7 @@ + EXTRA_libsigc_la_SOURCES = sigc_res.rc -libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION) -release $(SIGC_RELEASE) -no-undefined +libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION) -no-undefined - libsigcdir = $(prefix)/include/sigc++ + lib_LTLIBRARIES = libsigc.la diff --git a/devel/libsigc++/pkg/PLIST b/devel/libsigc++/pkg/PLIST index 6b2c0205679..91e5357a101 100644 --- a/devel/libsigc++/pkg/PLIST +++ b/devel/libsigc++/pkg/PLIST @@ -1,37 +1,38 @@ -@comment $OpenBSD: PLIST,v 1.2 2001/06/20 11:12:35 shell Exp $ +@comment $OpenBSD: PLIST,v 1.3 2001/10/24 12:54:37 shell Exp $ bin/sigc-config -include/sigc++/adaptor.h -include/sigc++/basic_signal.h -include/sigc++/bind.h -include/sigc++/class_slot.h -include/sigc++/convert.h -include/sigc++/func_slot.h -include/sigc++/generator.h -include/sigc++/handle.h -include/sigc++/handle_system.h -include/sigc++/macros/basic_signal.h.m4 -include/sigc++/macros/bind.h.m4 -include/sigc++/macros/class_slot.h.m4 -include/sigc++/macros/convert.h.m4 -include/sigc++/macros/func_slot.h.m4 -include/sigc++/macros/object_slot.h.m4 -include/sigc++/macros/retbind.h.m4 -include/sigc++/macros/rettype.h.m4 -include/sigc++/macros/slot.h.m4 -include/sigc++/macros/template.macros.m4 -include/sigc++/marshal.h -include/sigc++/object.h -include/sigc++/object_slot.h -include/sigc++/retbind.h -include/sigc++/rettype.h -include/sigc++/scope.h -include/sigc++/signal_system.h -include/sigc++/slot.h -include/sigc++/thread.h -include/sigc++/type.h +include/sigc++-1.0/sigc++/adaptor.h +include/sigc++-1.0/sigc++/basic_signal.h +include/sigc++-1.0/sigc++/bind.h +include/sigc++-1.0/sigc++/class_slot.h +include/sigc++-1.0/sigc++/convert.h +include/sigc++-1.0/sigc++/func_slot.h +include/sigc++-1.0/sigc++/generator.h +include/sigc++-1.0/sigc++/handle.h +include/sigc++-1.0/sigc++/handle_system.h +include/sigc++-1.0/sigc++/macros/basic_signal.h.m4 +include/sigc++-1.0/sigc++/macros/bind.h.m4 +include/sigc++-1.0/sigc++/macros/class_slot.h.m4 +include/sigc++-1.0/sigc++/macros/convert.h.m4 +include/sigc++-1.0/sigc++/macros/func_slot.h.m4 +include/sigc++-1.0/sigc++/macros/object_slot.h.m4 +include/sigc++-1.0/sigc++/macros/retbind.h.m4 +include/sigc++-1.0/sigc++/macros/rettype.h.m4 +include/sigc++-1.0/sigc++/macros/slot.h.m4 +include/sigc++-1.0/sigc++/macros/template.macros.m4 +include/sigc++-1.0/sigc++/marshal.h +include/sigc++-1.0/sigc++/object.h +include/sigc++-1.0/sigc++/object_slot.h +include/sigc++-1.0/sigc++/retbind.h +include/sigc++-1.0/sigc++/rettype.h +include/sigc++-1.0/sigc++/scope.h +include/sigc++-1.0/sigc++/signal_system.h +include/sigc++-1.0/sigc++/slot.h +include/sigc++-1.0/sigc++/thread.h +include/sigc++-1.0/sigc++/type.h lib/libsigc.a lib/libsigc.la -lib/sigc++/include/sigc++config.h +lib/sigc++-1.0/include/sigc++config.h +share/aclocal/sigc++.m4 share/doc/libsigc++/API share/doc/libsigc++/FAQ share/doc/libsigc++/UML @@ -42,9 +43,11 @@ share/doc/libsigc++/powerusers share/doc/libsigc++/requirements share/doc/libsigc++/riscos share/doc/libsigc++/signals +share/doc/libsigc++/win32 %%SHARED%% @dirrm share/doc/libsigc++ -@dirrm lib/sigc++/include -@dirrm lib/sigc++ -@dirrm include/sigc++/macros -@dirrm include/sigc++ +@dirrm lib/sigc++-1.0/include +@dirrm lib/sigc++-1.0 +@dirrm include/sigc++-1.0/sigc++/macros +@dirrm include/sigc++-1.0/sigc++ +@dirrm include/sigc++-1.0