From 46bb63b8f95ac7fe31d66b092bd188a039ca9fbe Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 9 Jun 2000 07:53:02 +0000
Subject: USE_LIBTOOL and LTCONFIG_OVERRIDE, instead of pkglibtool and patching
 configure.

---
 audio/libmikmod/Makefile         | 23 ++++++++++++-----------
 audio/libmikmod/files/patch-sum  |  4 ++--
 audio/libmikmod/patches/patch-ac | 26 +++++---------------------
 audio/libmikmod/pkg/PLIST        | 11 ++++++-----
 4 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 0f4077896ca..8115233a278 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:14 rh Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/09 07:53:02 jlam Exp $
 
-DISTNAME=	libmikmod-3.1.9
-CATEGORIES=	audio
-MASTER_SITES=	http://mikmod.darkorb.net/libmikmod/
+DISTNAME=		libmikmod-3.1.9
+CATEGORIES=		audio
+MASTER_SITES=		http://mikmod.darkorb.net/libmikmod/
 
-MAINTAINER=	kuebart@mathematik.uni-ulm.de
-HOMEPAGE=	http://mikmod.darkorb.net/
+MAINTAINER=		kuebart@mathematik.uni-ulm.de
+HOMEPAGE=		http://mikmod.darkorb.net/
 
-DEPENDS+=	esound-0.2.*:../../audio/esound
+DEPENDS+=		esound-0.2.*:../../audio/esound
 
-USE_PKGLIBTOOL=	YES
-USE_GMAKE=	YES
-USE_GTEXINFO=	YES
-GNU_CONFIGURE=	YES
+USE_GMAKE=		# defined
+USE_GTEXINFO=		# defined
+GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 pre-build:
 	${RM} -f ${WRKSRC}/docs/mikmod.info*
diff --git a/audio/libmikmod/files/patch-sum b/audio/libmikmod/files/patch-sum
index 03c6734198a..12ccca640c4 100644
--- a/audio/libmikmod/files/patch-sum
+++ b/audio/libmikmod/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/04/02 16:07:05 pooka Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/09 07:53:03 jlam Exp $
 
 MD5 (patch-aa) = 409427b33c38499e3914bf366dedbc66
 MD5 (patch-ab) = bb4e0d79708262a16bcd657ef6f354f5
-MD5 (patch-ac) = db119d37d4413263f3334a4cdc6dba24
+MD5 (patch-ac) = 9643f50fe86e3c3cfb2b2d7d3d2c76be
 MD5 (patch-ad) = 04ffc7eb83402832f5d07cc656bc01d9
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index 215a6f3c7ab..0505dd6af2a 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,24 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2000/04/02 16:07:05 pooka Exp $
+$NetBSD: patch-ac,v 1.3 2000/06/09 07:53:03 jlam Exp $
 
---- configure.orig	Mon Feb 14 22:20:17 2000
-+++ configure	Sun Apr  2 14:50:50 2000
-@@ -1646,6 +1646,7 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false ; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1799,6 +1800,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -1862,6 +1864,7 @@
+--- configure.orig	Mon Feb 14 15:20:17 2000
++++ configure	Fri Jun  9 03:41:08 2000
+@@ -1862,6 +1862,7 @@
  fi
  
  
@@ -26,7 +10,7 @@ $NetBSD: patch-ac,v 1.2 2000/04/02 16:07:05 pooka Exp $
  # Check if makeinfo support html output. If it doesn't, pretend it's missing
  # rather than failing rebuilding the documentation.
  echo $ac_n "checking if makeinfo supports html output""... $ac_c" 1>&6
-@@ -1881,6 +1884,7 @@
+@@ -1881,6 +1882,7 @@
  if test $libmikmod_cv_makeinfo_html = no
  then
  	MAKEINFO="$missing_dir/missing makeinfo"
diff --git a/audio/libmikmod/pkg/PLIST b/audio/libmikmod/pkg/PLIST
index a1c530df451..09975b662ba 100644
--- a/audio/libmikmod/pkg/PLIST
+++ b/audio/libmikmod/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2000/04/02 16:07:06 pooka Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/06/09 07:53:04 jlam Exp $
+bin/libmikmod-config
 include/mikmod.h
-lib/libmikmod.so.2.2
-lib/libmikmod.a
 @unexec install-info --delete %D/info/mikmod.info %D/info/dir
 info/mikmod.info
 @exec install-info %D/info/mikmod.info %D/info/dir
-bin/libmikmod-config
-share/aclocal/libmikmod.m4
+lib/libmikmod.a
+lib/libmikmod.la
+lib/libmikmod.so.2.2
 man/man1/libmikmod-config.1
+share/aclocal/libmikmod.m4
-- 
cgit v1.2.3