Fix build with liblrdf-0.5.0.

Some pkglint cleanup while here.
Bump PKGREVISION.

4 files changed, 53 insertions, 8 deletions

diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 6391fdb1886..6ca1958668e 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/03/03 00:12:40 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/03/21 10:07:36 wiz Exp $
 #
 
 DISTNAME=	jack-rack-1.4.7
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jack-rack/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,13 +10,14 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jack-rack.sourceforge.net/
 COMMENT=	Effects "rack" for JACK
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		autoconf gmake msgfmt pkg-config
 
 CONFIGURE_ARGS+=	--disable-aseq
 CONFIGURE_ARGS+=	--disable-lash
@@ -38,6 +39,9 @@ LADSPA_PLUGIN_PATH?=		${PREFIX}/lib/ladspa
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.glib2}/include/glib
 CPPFLAGS+=	-DLADSPA_PATH="\"${LADSPA_PLUGIN_PATH}\""
 
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/ecarack ${DESTDIR}${EGDIR}/ecarack.py
@@ -47,8 +51,8 @@ post-install:
 .include "../../audio/jack/buildlink3.mk"
 .include "../../audio/ladspa/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/jack-rack/distinfo b/audio/jack-rack/distinfo
index 45e21128742..48cf4a6a36d 100644
--- a/audio/jack-rack/distinfo
+++ b/audio/jack-rack/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/19 20:32:12 bjs Exp $
+$NetBSD: distinfo,v 1.2 2012/03/21 10:07:36 wiz Exp $
 
 SHA1 (jack-rack-1.4.7.tar.bz2) = 42e0e1b9b42db3249d565c5458f585f16b39974f
 RMD160 (jack-rack-1.4.7.tar.bz2) = 62fcef8d550ce77b241ba15dc249045c3fcfd2d9
 Size (jack-rack-1.4.7.tar.bz2) = 269478 bytes
 SHA1 (patch-aa) = ea5220ef62604fee53d2089eac519e2486e7e258
 SHA1 (patch-ab) = 271d56b3dd81aa740321f3789297b729a5892342
-SHA1 (patch-ac) = 298098e8db150e34145df7c725351086aac32776
+SHA1 (patch-ac) = 9ef4ca30af4e0fc9dcb8282a88e580852f51d0ad
 SHA1 (patch-ad) = 0211be4f1e745a64965bf8184660991fa036706d
 SHA1 (patch-ae) = c8c69e8a568b493fb266b12888b4325a955704df
 SHA1 (patch-af) = e119fe8e8877ffc21c8c65954980e1c15845b2ad
+SHA1 (patch-configure.ac) = 7c672c42912c7f2ed7988578265bea392bb0b916
diff --git a/audio/jack-rack/patches/patch-ac b/audio/jack-rack/patches/patch-ac
index 651ede2fd46..affea5b0627 100644
--- a/audio/jack-rack/patches/patch-ac
+++ b/audio/jack-rack/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/08/19 20:32:12 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2012/03/21 10:07:36 wiz Exp $
 
 Remove *_DISABLE_DEPRECATED--how will the package know what is
 deprecated and what isn't in the future?
 
 Use LDADD as appropriate for libtool.
 
---- src/Makefile.in.orig	2007-11-26 17:24:06.000000000 -0500
+--- src/Makefile.in.orig	2007-11-26 22:24:06.000000000 +0000
 +++ src/Makefile.in
 @@ -261,14 +261,9 @@ jack_rack_CFLAGS = \
  	$(XML_CFLAGS) \
diff --git a/audio/jack-rack/patches/patch-configure.ac b/audio/jack-rack/patches/patch-configure.ac
new file mode 100644
index 00000000000..1d90c961ebf
--- /dev/null
+++ b/audio/jack-rack/patches/patch-configure.ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-configure.ac,v 1.1 2012/03/21 10:07:36 wiz Exp $
+
+Use pkg-config file for lrdf, fixes its detection for >= 0.5.0.
+
+--- configure.ac.orig	2007-11-26 22:23:42.000000000 +0000
++++ configure.ac
+@@ -193,22 +193,21 @@ AC_ARG_ENABLE(lrdf,
+   esac
+ ])
+ 
+-if test x"$jr_enable_lrdf" = x"yes"; then
+-  AC_CHECK_HEADER(lrdf.h,
+-    AC_CHECK_LIB(lrdf, lrdf_init, LRDF_FOUND="yes", LRDF_FOUND="no"),
+-    LRDF_FOUND="no")
++if test "$jr_enable_lrdf" = "yes"; then
++  PKG_CHECK_MODULES(LRDF, lrdf, LRDF_FOUND="yes", LRDF_FOUND="no")
++
++  if test "$XML_FOUND" = "yes"; then
++    AC_DEFINE(HAVE_LRDF, 1, "whether or not lrdf support is enabled")
++    AC_SUBST(LRDF_CFLAGS)
++    AC_SUBST(LRDF_LIBS)
++  else
++    AC_MSG_WARN([lrdf support is disabled])
++  fi
+ else
++  XML_FOUND="no"
+   AC_MSG_WARN([lrdf support is disabled])
+-  LRDF_FOUND="no"
+ fi
+ 
+-if test x$LRDF_FOUND = xyes; then
+-  AC_DEFINE(HAVE_LRDF, 1, "whether or not lrdf support is enabled")
+-  LRDF_CFLAGS=""
+-  LRDF_LIBS="-llrdf"
+-  AC_SUBST(LRDF_CFLAGS)
+-  AC_SUBST(LRDF_LIBS)
+-fi
+ AM_CONDITIONAL(HAVE_LRDF, test "$LRDF_FOUND" = "yes")
+ 
+