From 2da9e838f4dd263842f13fc88d5dcb055013d6a3 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 23 Sep 2002 23:05:42 +0000
Subject: buildlink1 -> buildlink2 and minor installation fixups.

---
 x11/xbindkeys-config/Makefile         |  8 +++++---
 x11/xbindkeys-config/distinfo         |  4 ++--
 x11/xbindkeys-config/patches/patch-aa | 18 ++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'x11/xbindkeys-config')

diff --git a/x11/xbindkeys-config/Makefile b/x11/xbindkeys-config/Makefile
index 1c24695b84f..71df52f5f28 100644
--- a/x11/xbindkeys-config/Makefile
+++ b/x11/xbindkeys-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/11 14:25:25 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/23 23:05:42 jlam Exp $
 
 DISTNAME=	xbindkeys_config-0.1.2
 PKGNAME=	xbindkeys-config-0.1.2
@@ -11,6 +11,8 @@ COMMENT=	Tool to configure xbindkeys graphically
 
 DEPENDS+=	xbindkeys-[0-9]*:../xbindkeys
 
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
+
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbindkeys-config/distinfo b/x11/xbindkeys-config/distinfo
index 6036ddf153e..27f582bfe46 100644
--- a/x11/xbindkeys-config/distinfo
+++ b/x11/xbindkeys-config/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/11 14:25:25 tron Exp $
+$NetBSD: distinfo,v 1.2 2002/09/23 23:05:42 jlam Exp $
 
 SHA1 (xbindkeys_config-0.1.2.tar.gz) = da6d3a5e5ba00dedad3d5f6dc145989fabacb491
 Size (xbindkeys_config-0.1.2.tar.gz) = 17579 bytes
-SHA1 (patch-aa) = f96cea02e4e630b7f9a2ecedb8219ca2e4bbd683
+SHA1 (patch-aa) = e70cf0fa62647a9d5f6a98e31c4e6de05dde9784
diff --git a/x11/xbindkeys-config/patches/patch-aa b/x11/xbindkeys-config/patches/patch-aa
index 96efa67163e..399067eca9b 100644
--- a/x11/xbindkeys-config/patches/patch-aa
+++ b/x11/xbindkeys-config/patches/patch-aa
@@ -1,29 +1,27 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/11 14:25:25 tron Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/23 23:05:43 jlam Exp $
 
---- Makefile.orig	Tue Jun  4 11:35:45 2002
-+++ Makefile	Sun Jun 16 20:51:30 2002
+--- Makefile.orig	Tue Jun  4 02:35:45 2002
++++ Makefile
 @@ -1,13 +1,13 @@
  # makefile crée par Laurent VUIBERT
  
 -CC=	gcc -O3 -Wall
 +CC=	gcc ${CFLAGS}
  STD=	_GNU_SOURCE
--GTK=	`gtk-config  --cflags --libs`
--GTK2=	`gtk-config  --cflags`
-+GTK=	`${BUILDLINK_DIR}/bin/gtk-config  --cflags --libs`
-+GTK2=	`${BUILDLINK_DIR}/bin/gtk-config  --cflags`
+ GTK=	`gtk-config  --cflags --libs`
+ GTK2=	`gtk-config  --cflags`
  OBJS=	xbindkeys_config.o menu.o middle.o speedc.o
  NOM=    xbindkeys_config
  
 -prefix=	/usr
-+prefix=	${LOCALBASE}
++prefix=	${PREFIX}
  
  .c.o: 
  	$(CC) $(GTK2) -D$(STD) -c $<
-@@ -22,5 +22,5 @@
+@@ -22,5 +22,5 @@ clean:
  	rm -rf .v*
  
  install:
 -	cp $(NOM) $(DESTDIR)$(prefix)/bin/
-+	install -m 555 -o root -g wheel -c $(NOM) $(DESTDIR)$(prefix)/bin/
++	${BSD_INSTALL_PROGRAM} $(NOM) $(DESTDIR)$(prefix)/bin/
  #End Makefile 
-- 
cgit v1.2.3