Adapt this package to NetBSD and update it to version 0.1.6.

5 files changed, 35 insertions, 72 deletions

diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 1483abe06e3..e98dc305957 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,21 +1,18 @@
-# New ports collection makefile for:	libaudiofile
-# Version required:			0.1.5
-# Date created:				22 Dec 1998
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
-#
-# Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp
+# $NetBSD: Makefile,v 1.2 1999/03/06 21:31:41 tron Exp $
+# FreeBSD Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp
 #
 
-DISTNAME=	libaudiofile-0.1.5
+DISTNAME=	audiofile-0.1.6
+PKGNAME=	libaudiofile-0.1.6
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	libaudiofile
+MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/gnome-1.0/sources/ \
+		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
+		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
 
-MAINTAINER=	vanilla@FreeBSD.ORG
+MAINTAINER=	tron@netbsd.org
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.mk>
+.include <../../mk/bsd.pkg.mk>
diff --git a/audio/libaudiofile/files/md5 b/audio/libaudiofile/files/md5
index 85b11de7d87..5d48b4dccad 100644
--- a/audio/libaudiofile/files/md5
+++ b/audio/libaudiofile/files/md5
@@ -1 +1,3 @@
-MD5 (libaudiofile-0.1.5.tar.gz) = 9eaf6631b47750c2c9cdedaa8da5546c
+$NetBSD: md5,v 1.2 1999/03/06 21:31:42 tron Exp $
+
+MD5 (audiofile-0.1.6.tar.gz) = 787c59576393dfb7bdc1a2d2da67441e
diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa
index 67d60c5e8db..8c787955c03 100644
--- a/audio/libaudiofile/patches/patch-aa
+++ b/audio/libaudiofile/patches/patch-aa
@@ -1,19 +1,20 @@
---- ltmain.sh.orig	Thu Dec 31 13:06:58 1998
-+++ ltmain.sh	Thu Dec 31 13:07:53 1998
-@@ -923,6 +923,16 @@
-         versuffix="$current.$revision"
-         ;;
+$NetBSD: patch-aa,v 1.2 1999/03/06 21:31:42 tron Exp $
+
+--- configure.orig	Mon Feb 22 22:14:36 1999
++++ configure	Sat Mar  6 22:23:44 1999
+@@ -1541,6 +1541,7 @@
+ fi
  
-+      freebsd)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+        versuffix="$current"
-+	else
-+        versuffix="$current.$revision"
-+	fi
-+        ;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+ # Always use our own libtool.
++if false; then
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Check for any special flags to pass to ltconfig.
+@@ -1772,6 +1773,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/audio/libaudiofile/patches/patch-ab b/audio/libaudiofile/patches/patch-ab
deleted file mode 100644
index 2961bcfd174..00000000000
--- a/audio/libaudiofile/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
---- ltconfig.orig	Tue Dec 15 01:13:45 1998
-+++ ltconfig	Tue Feb  2 02:30:10 1999
-@@ -767,7 +767,7 @@
-     ;;
- 
-   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
--  freebsd3*)
-+  freebsd*)
-     archive_cmds='$CC -shared -o $lib$libobjs'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-@@ -1105,10 +1105,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-   ;;
- 
--freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='$libname.so.$versuffix $libname.so'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd*)
-+  version_type=freebsd
-+  library_names_spec='$libname.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
diff --git a/audio/libaudiofile/pkg/PLIST b/audio/libaudiofile/pkg/PLIST
index 6c86b79e6f8..ada3c86b879 100644
--- a/audio/libaudiofile/pkg/PLIST
+++ b/audio/libaudiofile/pkg/PLIST
@@ -1,12 +1,9 @@
+@comment $NetBSD: PLIST,v 1.2 1999/03/06 21:31:42 tron Exp $
 bin/audiofile-config
 bin/sfconvert
 bin/sfinfo
 include/audiofile.h
 include/aupvlist.h
 lib/libaudiofile.a
-lib/libaudiofile.la
-lib/libaudiofile.so
-lib/libaudiofile.so.0
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+lib/libaudiofile.so.0.0
 share/aclocal/audiofile.m4