- Switch MASTER_SITE to MASTER_SITE_SOURCEFORGE

- Regenerate patches and distinfo as distfile hosted by sf.net is slightly
  different (regenerated configure script and friends) but has same version
  number

ok brad@

graphics/fnlib/Makefile

@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2004/11/30 01:06:34 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2004/12/14 18:28:57 alek Exp $
 
 COMMENT=	"color font rendering library for X"
 
 DISTNAME=	fnlib-0.5
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.squish.org/pub/enlightenment/enlightenment/libs/ \
-		ftp://ftp.shellhung.org/pub/Mirror/enlightenment/fnlib/ \
-		ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/libs/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
 LIB_DEPENDS=	Imlib.19::graphics/imlib
 

graphics/fnlib/distinfo

@@ -1,3 +1,3 @@
-MD5 (fnlib-0.5.tar.gz) = 42093ed5b684da01e7a674b2adac52c7
-RMD160 (fnlib-0.5.tar.gz) = 9f1a9af07d8dff0626b5c1219572f2c2758a7e50
-SHA1 (fnlib-0.5.tar.gz) = fd1ace80c3069d3ccb7b3aa7943e6688b61988f2
+MD5 (fnlib-0.5.tar.gz) = 99e9558739b97c82b728e408d9cb1f01
+RMD160 (fnlib-0.5.tar.gz) = b47d35467eba385863dfc661db33fa69664f85cf
+SHA1 (fnlib-0.5.tar.gz) = 0dd7053e443ea5d22e4864fe6997b77901118335

graphics/fnlib/patches/patch-ltconfig

@@ -1,51 +0,0 @@
---- ltconfig.orig	Mon Oct 18 20:27:23 1999
-+++ ltconfig	Tue Feb 20 16:58:21 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*)

graphics/fnlib/patches/patch-ltmain.sh

@@ -1,46 +1,6 @@
---- ltmain.sh.orig	Mon Oct 18 20:27:23 1999
-+++ ltmain.sh	Tue Feb 20 16:59:28 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'\
+--- ltmain.sh.orig	Sun Dec 12 17:24:41 2004
++++ ltmain.sh	Sun Dec 12 17:29:06 2004
+@@ -4450,40 +4450,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
@@ -52,7 +12,7 @@
 -    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 "specify the full pathname of the library, or use the \`-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"