- upgrade to version 0.99.6

- update HOMEPAGE and MASTER_SITES
- bump NEED_VERSION

audio/libcdaudio/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2001/06/15 02:08:39 kevlo Exp $
+# $OpenBSD: Makefile,v 1.4 2001/10/30 07:58:24 kevlo Exp $
 
 COMMENT=	"multi-platform cd player development library"
-DISTNAME=	libcdaudio-0.99.4
+DISTNAME=	libcdaudio-0.99.6
 CATEGORIES=	audio
-NEED_VERSION=	1.364
+NEED_VERSION=	1.488
 
-HOMEPAGE=	http://cdcd.undergrid.net/libcdaudio/
+HOMEPAGE=	http://libcdaudio.sourceforge.net/
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 
@@ -14,12 +14,13 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= distributions/gentoo/gentoo-sources/
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE} 
+MASTER_SITE_SUBDIR=	libcdaudio
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
 
+PATCH_LIST=	${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig
 
 .include <bsd.port.mk>

audio/libcdaudio/files/md5

@@ -1,3 +1,3 @@
-MD5 (libcdaudio-0.99.4.tar.gz) = 1e673579fc377f2240d993a558a048be
-RMD160 (libcdaudio-0.99.4.tar.gz) = 01d6e3a70f090e0e886e2c7520fd9cb031a138d2
-SHA1 (libcdaudio-0.99.4.tar.gz) = 00ee00d4e6dcff71b28be377b972c91f0277e273
+MD5 (libcdaudio-0.99.6.tar.gz) = 4c8f50427125497c51249d8d74bd91af
+RMD160 (libcdaudio-0.99.6.tar.gz) = d942a43ec54b09b04c4771226619b0c4a45363d7
+SHA1 (libcdaudio-0.99.6.tar.gz) = a75bd8c8204081d05f09e7c1139f26e9ca7cf801

audio/libcdaudio/patches/patch-ltconfig

@@ -1,51 +0,0 @@
---- ltconfig.orig	Sun Dec 26 13:54:01 1999
-+++ ltconfig	Sun Feb 18 11:17:44 2001
-@@ -1105,6 +1105,9 @@
-     with_gnu_ld=no
-   fi
-   ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- 
- esac
- 
-@@ -1391,10 +1394,21 @@
-     ;;
- 
-   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 @@
- 
- 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*)

audio/libcdaudio/patches/patch-ltmain.sh

@@ -1,47 +1,49 @@
---- ltmain.sh.orig	Sun Dec 26 13:54:01 1999
-+++ ltmain.sh	Sun Feb 18 11:19:01 2001
-@@ -1073,6 +1073,17 @@
- 	    # These systems don't actually have c library (as such)
+--- ltmain.sh.orig	Tue Oct 30 15:25:31 2001
++++ ltmain.sh	Tue Oct 30 15:40:27 2001
+@@ -1027,15 +1027,30 @@
+ 	    # These systems don't actually have a C or math library (as such)
  	    continue
  	    ;;
++
+ 	  *-*-mingw* | *-*-os2*)
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
 +	  *-*-openbsd*)
 +	    # Do not include libc due to us having libc/libc_r.
 +	    continue
 +	    ;;
-+	  esac
-+	elif test "$arg" = "-lc_r"; then
++          esac
++        elif test "$arg" = "-lc_r"; then
 +	  case "$host" in
 +	  *-*-openbsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
++        # Do not include libc_r directly, use -pthread flag.
++	     continue
++	     ;;
  	  esac
- 	elif test "$arg" = "-lm"; then
- 	  case "$host" in
-@@ -1085,6 +1096,10 @@
+ 	fi
  	deplibs="$deplibs $arg"
+ 	continue
  	;;
++	-?thread)
++	  deplibs="$deplibs $arg"
++	  ;;
  
-+      -?thread)
-+	deplibs="$deplibs $arg"
-+	;;
-+
        -module)
  	module=yes
- 	continue
-@@ -1789,6 +1804,9 @@
- 	*-*-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 @@
+@@ -2408,6 +2423,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-openbsd*)
++	    # Do not include libc due to us having libc/libc_r
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4412,40 +4430,6 @@
      # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
+     test "$show" = ":" && exit 0
  
 -    echo "----------------------------------------------------------------------"
 -    echo "Libraries have been installed in:"
@@ -51,7 +53,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"