diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index 7ed54a0a834..92272156edc 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2001/10/04 18:10:09 danh Exp $ +# $OpenBSD: Makefile,v 1.17 2001/10/08 16:36:57 danh Exp $ COMMENT= "system to store and display time-series data" @@ -42,4 +42,11 @@ post-install: cd ${WRKSRC} && ${MAKE} site-tcl-install .endif +post-patch: + @cd ${WRKSRC}/config; \ + ${PATCH} --forward --quiet -E < \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig && \ + ${PATCH} --forward --quiet -E < \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh + .include diff --git a/net/rrdtool/patches/patch-config_ltconfig b/net/rrdtool/patches/patch-config_ltconfig deleted file mode 100644 index fd22895a839..00000000000 --- a/net/rrdtool/patches/patch-config_ltconfig +++ /dev/null @@ -1,86 +0,0 @@ -$OpenBSD: patch-config_ltconfig,v 1.5 2001/10/04 18:10:09 danh Exp $ ---- config/ltconfig.orig Mon Feb 5 15:21:50 2001 -+++ config/ltconfig Thu Oct 4 13:30:45 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 -@@ -1391,10 +1400,24 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- 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 $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='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ ;; -+ esac -+ fi - ;; - - os2*) -@@ -1955,9 +1978,25 @@ 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 -+ 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' diff --git a/net/rrdtool/patches/patch-config_ltmain_sh b/net/rrdtool/patches/patch-config_ltmain_sh deleted file mode 100644 index e29fcdcf461..00000000000 --- a/net/rrdtool/patches/patch-config_ltmain_sh +++ /dev/null @@ -1,99 +0,0 @@ -$OpenBSD: patch-config_ltmain_sh,v 1.2 2001/10/04 18:10:09 danh Exp $ ---- config/ltmain.sh.orig Fri Aug 6 00:06:50 1999 -+++ config/ltmain.sh Thu Oct 4 13:38:58 2001 -@@ -1073,6 +1073,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 -@@ -1085,6 +1096,17 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1789,6 +1811,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. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -2598,7 +2623,7 @@ static const void *lt_preloaded_setup() - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*) -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; -@@ -3522,40 +3547,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 - ;; -