From 5daae0650cff0b81a0e01fd1225a04ef0649900b Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 3 Jun 2004 03:57:17 +0000
Subject: Update to 1.2.2, with gtk20.

---
 x11/bbrun/Makefile             |  8 +++-----
 x11/bbrun/distinfo             |  4 ++--
 x11/bbrun/files/patch-Makefile | 35 ++++++++++++-----------------------
 3 files changed, 17 insertions(+), 30 deletions(-)

(limited to 'x11/bbrun')

diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index fca89083417e..09ca974c362e 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	bbrun
-PORTVERSION=	1.4
-PORTREVISION=	2
+PORTVERSION=	1.6
 CATEGORIES=	x11
-MASTER_SITES=	http://www.dwave.net/~jking/bbrun/
+MASTER_SITES=	http://www.darkops.net/bbrun/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Run box for Blackbox
 
 USE_GETOPT_LONG=yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_XPM=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
diff --git a/x11/bbrun/distinfo b/x11/bbrun/distinfo
index a7af8889ae5c..85babad4929f 100644
--- a/x11/bbrun/distinfo
+++ b/x11/bbrun/distinfo
@@ -1,2 +1,2 @@
-MD5 (bbrun-1.4.tar.gz) = d31cecada7d39b894bdf6012c6bae98a
-SIZE (bbrun-1.4.tar.gz) = 21041
+MD5 (bbrun-1.6.tar.gz) = 820960e3d52ddf2d5cf7e4ba51821bfd
+SIZE (bbrun-1.6.tar.gz) = 21132
diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile
index 2b0fd3d7c82e..8997d77adec8 100644
--- a/x11/bbrun/files/patch-Makefile
+++ b/x11/bbrun/files/patch-Makefile
@@ -1,29 +1,18 @@
---- Makefile.orig	Sat Jul 20 12:47:49 2002
-+++ Makefile	Sat Jul 20 20:24:41 2002
-@@ -1,16 +1,15 @@
+--- Makefile.orig	Wed Jun  2 23:54:33 2004
++++ Makefile	Wed Jun  2 23:55:08 2004
+@@ -1,5 +1,4 @@
 -CC     = gcc
--LIBS   = -lXpm `gtk-config --libs`
--CFLAGS = `gtk-config --cflags`
-+LIBS   = -lXpm `${GTK_CONFIG} --libs` 
-+CFLAGS += `${GTK_CONFIG} --cflags` -Wall
- OBJS   = bbrun.o \
-          ../wmgeneral/wmgeneral.o \
-          ../wmgeneral/misc.o \
-          ../wmgeneral/list.o
+-LIBDIR = -L/usr/lib -L/usr/X11R6/lib
++LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib
+ LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
+ CFLAGS = `pkg-config --cflags gtk+-2.0`
+ 
+@@ -11,7 +10,7 @@
+ all: bbrun
  
  .c.o:
 -	$(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS)
-+	$(CC) -c $< -o $*.o $(CFLAGS)
++	$(CC) -g -c -Wall $< -o $*.o $(CFLAGS)
  
  bbrun: $(OBJS)
--	$(CC) -Wall -g -o bbrun $^ $(LIBS)
-+	$(CC) -o bbrun $^ $(LDFLAGS) $(LIBS)
- 
- install:
- 	cp bbrun /usr/local/bin/
-@@ -18,3 +17,5 @@
- clean:
- 	rm -f bbrun $(OBJS)
- 	rm -f core
-+
-+all: bbrun
+ 	$(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS)
-- 
cgit v1.2.3