Date: Tue, 30 Oct 2001 16:41:02 +0100 From: Stijn Hoop <stijn@win.tue.nl> To: freebsd-ports@freebsd.org, freebsd-gnats-submit@freebsd.org Cc: patseal@hyperhost.net, killer@prosalg.no, roam@freebsd.org Subject: Re: ports/31509: bbkeys port outdated! Message-ID: <20011030164102.A58147@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
--+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Please find a different version of the patch attached, that uses the newly ported bbconf (see PR ports/31639). I think this approach is better, maybe the maintainer does too. --Stijn -- Q: Why is Batman better than Bill Gates? A: Batman was able to beat the Penguin. --+QahgC5+KEYLbs62 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="bbkeys.patch" diff -urN /usr/ports/x11-wm/bbkeys/Makefile bbkeys/Makefile --- /usr/ports/x11-wm/bbkeys/Makefile Tue Apr 3 10:14:32 2001 +++ bbkeys/Makefile Tue Oct 30 16:15:45 2001 @@ -6,24 +6,23 @@ # PORTNAME= bbkeys -PORTVERSION= 0.3.6 +PORTVERSION= 0.8.3 CATEGORIES= x11-wm MASTER_SITES= http://movingparts.thelinuxcommunity.org/bbkeys/ MAINTAINER= patseal@hyperhost.net -RUN_DEPENDS= blackbox:${PORTSDIR}/x11-wm/blackbox +RUN_DEPENDS= bbconf:${PORTSDIR}/x11-wm/bbconf \ + blackbox:${PORTSDIR}/x11-wm/blackbox USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_QT_VER= 2 -do-build: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) - @(cd ${WRKSRC}/bbkeysconf-1.3; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) +MAN1= bbkeys.1 +MAN5= bbkeysrc.5 bbkeys.bb.5 -do-install: - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) - @(cd ${WRKSRC}/bbkeysconf-1.3 && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) +pre-patch: + @${PERL} -pi -e 's@doc/bbkeys@share/doc/bbkeys@g' ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff -urN /usr/ports/x11-wm/bbkeys/distinfo bbkeys/distinfo --- /usr/ports/x11-wm/bbkeys/distinfo Thu Mar 29 22:16:22 2001 +++ bbkeys/distinfo Tue Oct 30 16:25:50 2001 @@ -1 +1 @@ -MD5 (bbkeys-0.3.6.tar.gz) = a8d24c463ea8900c4f5e5fdbc4ee8f9f +MD5 (bbkeys-0.8.3.tar.gz) = f38ea900ad8c6a797833b4d380f737cd diff -urN /usr/ports/x11-wm/bbkeys/files/patch-aa bbkeys/files/patch-aa --- /usr/ports/x11-wm/bbkeys/files/patch-aa Thu Mar 29 22:16:27 2001 +++ bbkeys/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,39 +0,0 @@ ---- bbkeysconf-1.3/Makefile.orig Thu Mar 15 01:16:54 2001 -+++ bbkeysconf-1.3/Makefile Sun Mar 25 19:10:37 2001 -@@ -1,11 +1,11 @@ --CXX= /usr/bin/g++ --QTDIR = /usr/lib/qt2 --MOC = /usr/bin/moc --LIBS = -L$(QTDIR)/lib -L/usr/X11R6/lib -L/usr/lib -lqt -lX11 --CXXFLAGS = -g -I/usr/include -I/usr/include/qt -I/usr/X11R6/include -+CXX ?= /usr/bin/g++ -+QTDIR = /usr/X11R6 -+MOC = /usr/X11R6/bin/moc2 -+LIBS = -L$(QTDIR)/lib -lqt2 -+CXXFLAGS += -I$(QTDIR)/include -I$(QTDIR)/include/qt2 - - TARGET = bbkeysconf --PREFIX = /usr/local/bin -+PREFIX ?= /usr/local - OBJECTS = gui.o main.o myapplication.o - SOURCES = gui.cc main.cc myapplication.cc - MOCSRC = gui.hh -@@ -37,13 +37,13 @@ - if ! test -x $(TARGET) ; then \ - exit; \ - fi; \ -- echo "Checking existance of $(PREFIX)...."; \ -+ echo "Checking existance of $(PREFIX)/bin...."; \ - if ! test -d $(PREFIX) ; then \ -- echo "Heyyyyy. $(PREFIX) doesn't exist. Creating it...."; \ -- /usr/bin/install -d $(PREFIX); \ -+ echo "Heyyyyy. $(PREFIX)/bin doesn't exist. Creating it...."; \ -+ /usr/bin/install -d $(PREFIX)/bin; \ - fi ; \ -- echo "Installing $(TARGET) in $(PREFIX)..."; \ -- /usr/bin/install -s $(TARGET) $(PREFIX)/$(TARGET) -+ echo "Installing $(TARGET) in $(PREFIX)/bin..."; \ -+ /usr/bin/install -s $(TARGET) $(PREFIX)/bin/$(TARGET) - - gui.o: gui.cc gui.moc - main.o: main.cc diff -urN /usr/ports/x11-wm/bbkeys/pkg-plist bbkeys/pkg-plist --- /usr/ports/x11-wm/bbkeys/pkg-plist Wed Jul 19 15:18:16 2000 +++ bbkeys/pkg-plist Tue Oct 30 16:17:25 2001 @@ -1,7 +1,10 @@ bin/bbkeys bin/bbkeysConfigC -bin/bbkeysconf share/bbtools/bbkeys.bb share/bbtools/bbkeys.nobb share/bbtools/README.bbkeys +share/doc/bbkeys/README +share/doc/bbkeys/AUTHORS +share/doc/bbkeys/ChangeLog +@dirrm share/doc/bbkeys @dirrm share/bbtools --+QahgC5+KEYLbs62-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011030164102.A58147>