diff --git a/devel/sdl-image/Makefile b/devel/sdl-image/Makefile index e1655a19550..26f9c484452 100644 --- a/devel/sdl-image/Makefile +++ b/devel/sdl-image/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2002/05/26 17:40:40 brad Exp $ +# $OpenBSD: Makefile,v 1.9 2002/06/23 07:55:59 mark Exp $ COMMENT= "SDL image library" -VER= 1.2.1 +VER= 1.2.2 PROJ= SDL_image DISTNAME= ${PROJ}-${VER} PKGNAME= sdl-image-${VER} diff --git a/devel/sdl-image/distinfo b/devel/sdl-image/distinfo index 47efc6f9855..3f84d48f331 100644 --- a/devel/sdl-image/distinfo +++ b/devel/sdl-image/distinfo @@ -1,3 +1,3 @@ -MD5 (SDL_image-1.2.1.tar.gz) = 78ec9e3ac36416948fc7803fff494aaf -RMD160 (SDL_image-1.2.1.tar.gz) = 8ee3c3b4f30b8bedcce36bcf815f555595aa7aef -SHA1 (SDL_image-1.2.1.tar.gz) = f3545ef3f8872bf540ea24a8430be380388bc519 +MD5 (SDL_image-1.2.2.tar.gz) = d07cb8f3f0e8bbb645ef8369d96eb7db +RMD160 (SDL_image-1.2.2.tar.gz) = 5fb64911af1dc70ee9f364506f7ca27379ca4fc0 +SHA1 (SDL_image-1.2.2.tar.gz) = ad4225b2c93257c7f48288ad52cfb4aafff5fac3 diff --git a/devel/sdl-image/patches/patch-ltconfig b/devel/sdl-image/patches/patch-ltconfig deleted file mode 100644 index 9d6b793dc06..00000000000 --- a/devel/sdl-image/patches/patch-ltconfig +++ /dev/null @@ -1,75 +0,0 @@ ---- ltconfig~ Sat Dec 22 19:47:31 2001 -+++ ltconfig Sat Dec 22 19:56:31 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. -@@ -1444,19 +1451,23 @@ else - openbsd*) - 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 test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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*) -@@ -2083,11 +2094,20 @@ openbsd*) - version_type=sunos - 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__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -- shlibpath_overrides_runpath=no -+ 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 diff --git a/devel/sdl-image/pkg/PFRAG.shared b/devel/sdl-image/pkg/PFRAG.shared index 7dc69bf4701..c9e4643396f 100644 --- a/devel/sdl-image/pkg/PFRAG.shared +++ b/devel/sdl-image/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2001/12/23 05:07:55 obecian Exp $ -lib/libSDL_image.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2002/06/23 07:55:59 mark Exp $ +lib/libSDL_image.so.1.1 DYNLIBDIR(%B)