Subject: pkg/17707: Strongly buildlinkify audio/gkrellm-xmms
To: None <gnats-bugs@gnats.netbsd.org>
From: Julio Merino <jmmv@hispabsd.org>
List: netbsd-bugs
Date: 07/24/2002 17:50:33
>Number:         17707
>Category:       pkg
>Synopsis:       Strongly buildlinkify audio/gkrellm-xmms
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 24 08:50:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6D
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.6D NetBSD 1.6D (DARKSTAR) #0: Mon Jul 22 12:44:12 CEST 2002 jmmv@darkstar.local:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	The synopsis says it ;) Strongly buildlinkify the package
	audio/gkrellm-xmms.

	I'm not sure if the changes I've done to patch-aa are needed to
	execute the correct config wrapper or instead the buildlink stuff
	changes PATH to point to .buildlink/bin automatically. If so,
	remove that and apply only the patch to Makefile.
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/audio/gkrellm-xmms/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- Makefile	2002/06/11 19:23:39	1.4
+++ Makefile	2002/07/24 15:46:16
@@ -10,10 +10,13 @@
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
 COMMENT=	gkrellm xmms plugin
 
-DEPENDS+=       xmms>=1.2.5:../xmms
-DEPENDS+=       gkrellm>=1.2.11:../../sysutils/gkrellm
+USE_BUILDLINK_ONLY=	yes
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
 
+.include "../xmms/buildlink.mk"
+.include "../../sysutils/gkrellm/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/audio/gkrellm-xmms/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo	2002/06/11 19:23:39	1.2
+++ distinfo	2002/07/24 15:46:16
@@ -2,4 +2,4 @@
 
 SHA1 (gkrellmms-0.5.6.tar.gz) = a657f47c5e8f5a874c0ad0b91e238147065593bc
 Size (gkrellmms-0.5.6.tar.gz) = 27249 bytes
-SHA1 (patch-aa) = f0b0c9266046bcea9b97fd9ae57f41b595d1eb11
+SHA1 (patch-aa) = 53c8e06f42a00998fa4cf23d3f275e0cb385782a
Index: patches/patch-aa
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/audio/gkrellm-xmms/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-aa
--- patch-aa	2001/10/30 13:22:05	1.1.1.1
+++ patch-aa	2002/07/24 15:46:16
@@ -1,10 +1,23 @@
 $NetBSD: patch-aa,v 1.1.1.1 2001/10/30 13:22:05 damon Exp $
 
---- Makefile.orig	Sat Jan 20 15:28:38 2001
-+++ Makefile
-@@ -10,14 +10,16 @@
- XMMS_INCLUDE = `xmms-config --cflags`
- XMMS_LIB = `xmms-config --libs`
+--- Makefile.orig	Sun Apr 28 09:06:33 2002
++++ Makefile	Wed Jul 24 17:45:47 2002
+@@ -3,21 +3,23 @@
+ # You may want to rename the binary-file.
+ BIN_FILENAME = gkrellmms
+ 
+-GTK_INCLUDE = `gtk-config --cflags`
+-GTK_LIB = `gtk-config --libs`
+-IMLIB_INCLUDE = `imlib-config --cflags-gdk`
+-IMLIB_LIB = `imlib-config --libs-gdk`
+-XMMS_INCLUDE = `xmms-config --cflags`
+-XMMS_LIB = `xmms-config --libs`
++GTK_INCLUDE = `${BUILDLINK_DIR}/bin/gtk-config --cflags`
++GTK_LIB = `${BUILDLINK_DIR}/bin/gtk-config --libs`
++IMLIB_INCLUDE = `${BUILDLINK_DIR}/bin/imlib-config --cflags-gdk`
++IMLIB_LIB = `${BUILDLINK_DIR}/bin/imlib-config --libs-gdk`
++XMMS_INCLUDE = `${BUILDLINK_DIR}/bin/xmms-config --cflags`
++XMMS_LIB = `${BUILDLINK_DIR}/bin/xmms-config --libs`
  
 -FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
 +CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
>Release-Note:
>Audit-Trail:
>Unformatted: