From 02c172d6443cc2656ddfb4de2205503c4303d554 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 28 Oct 2001 04:12:14 +0000 Subject: [PATCH] - add BUILD/RUN dependency entry for netpbm. - add RUN dependency entry for jpeg. - use in-tree libtool patches. --- graphics/imlib/Makefile | 9 ++- graphics/imlib/patches/patch-ltconfig | 51 ---------------- graphics/imlib/patches/patch-ltmain.sh | 83 -------------------------- 3 files changed, 8 insertions(+), 135 deletions(-) delete mode 100644 graphics/imlib/patches/patch-ltconfig delete mode 100644 graphics/imlib/patches/patch-ltmain.sh diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index db777c9fcf1..bea8a27ac31 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2001/10/28 03:30:36 brad Exp $ +# $OpenBSD: Makefile,v 1.33 2001/10/28 04:12:14 brad Exp $ # $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $ COMMENT= "image manipulation library for X11" @@ -14,6 +14,9 @@ LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \ gif.4.1::graphics/giflib \ png.2::graphics/png \ tiff.35::graphics/tiff +BUILD_DEPENDS= ::graphics/netpbm +RUN_DEPENDS= ::graphics/jpeg \ + ::graphics/netpbm MAINTAINER= Brad Smith @@ -31,6 +34,10 @@ CONFIGURE_ARGS+= --enable-static --disable-modules CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \ + ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \ + patch-* + pre-build: @echo "" @echo "*** WARNING: you may see an error such as" diff --git a/graphics/imlib/patches/patch-ltconfig b/graphics/imlib/patches/patch-ltconfig deleted file mode 100644 index 050c5cb3f2e..00000000000 --- a/graphics/imlib/patches/patch-ltconfig +++ /dev/null @@ -1,51 +0,0 @@ ---- ltconfig.orig Sun Oct 3 15:17:34 1999 -+++ ltconfig Tue Feb 20 17:11:31 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1391,10 +1394,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 [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1955,13 +1969,10 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- 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/graphics/imlib/patches/patch-ltmain.sh b/graphics/imlib/patches/patch-ltmain.sh deleted file mode 100644 index cf1640ff2a7..00000000000 --- a/graphics/imlib/patches/patch-ltmain.sh +++ /dev/null @@ -1,83 +0,0 @@ ---- ltmain.sh.orig Sun Oct 3 15:17:34 1999 -+++ ltmain.sh Tue Feb 20 17:12:45 2001 -@@ -1073,7 +1073,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*) -@@ -1085,6 +1096,10 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ - -module) - module=yes - continue -@@ -1789,6 +1804,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" -@@ -3522,40 +3540,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 - ;; -