diff --git a/graphics/libart/Makefile b/graphics/libart/Makefile index 1ad03a816a5..021775b9554 100644 --- a/graphics/libart/Makefile +++ b/graphics/libart/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 2001/10/28 13:05:47 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2001/11/01 08:12:19 wilfried Exp $ COMMENT= "high-performance 2D graphics library" VERSION= 2.3.3 DISTNAME= libart-${VERSION} CATEGORIES= graphics -NEED_VERSION= 1.435 +NEED_VERSION= 1.475 MASTER_SITES= http://www.artofcode.com/libart/ HOMEPAGE= http://www.artofcode.com/libart.html @@ -15,6 +15,10 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \ + patch-* + SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} diff --git a/graphics/libart/patches/patch-ltconfig b/graphics/libart/patches/patch-ltconfig deleted file mode 100644 index f999f386ae9..00000000000 --- a/graphics/libart/patches/patch-ltconfig +++ /dev/null @@ -1,80 +0,0 @@ ---- ltconfig.orig Fri Mar 3 11:50:28 2000 -+++ ltconfig Fri Aug 31 20:28:03 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 -@@ -1396,10 +1405,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*) -@@ -1997,9 +2017,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/graphics/libart/patches/patch-ltmain.sh b/graphics/libart/patches/patch-ltmain.sh deleted file mode 100644 index 1fc9031fcc3..00000000000 --- a/graphics/libart/patches/patch-ltmain.sh +++ /dev/null @@ -1,83 +0,0 @@ ---- ltmain.sh.orig Fri Mar 3 11:50:28 2000 -+++ ltmain.sh Tue Feb 20 17:26:49 2001 -@@ -1079,7 +1079,18 @@ 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 - *-*-cygwin* | *-*-beos*) -@@ -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. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3555,40 +3573,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 - ;; -