aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11-wm/bbkeys/Makefile22
-rw-r--r--x11-wm/bbkeys/distinfo2
-rw-r--r--x11-wm/bbkeys/files/patch-aa39
-rw-r--r--x11-wm/bbkeys/pkg-descr5
-rw-r--r--x11-wm/bbkeys/pkg-plist5
5 files changed, 19 insertions, 54 deletions
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index daa47221004..0cf7e1f0544 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -6,24 +6,28 @@
#
PORTNAME= bbkeys
-PORTVERSION= 0.3.6
+PORTVERSION= 0.8.3
CATEGORIES= x11-wm
MASTER_SITES= http://movingparts.thelinuxcommunity.org/bbkeys/
-MAINTAINER= patseal@hyperhost.net
+MAINTAINER= stijn@win.tue.nl
-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:
+.if !defined(NOPORTDOCS)
+ @${PERL} -pi -e 's@doc/bbkeys@share/doc/bbkeys@g' ${WRKSRC}/Makefile.in
+.else
+ @${PERL} -ni -e '/^(docdir|doc_DATA)/ && next; print' \
+ ${WRKSRC}/Makefile.in
+.endif
.include <bsd.port.mk>
diff --git a/x11-wm/bbkeys/distinfo b/x11-wm/bbkeys/distinfo
index 74b24287d45..e059bdb62b3 100644
--- a/x11-wm/bbkeys/distinfo
+++ b/x11-wm/bbkeys/distinfo
@@ -1 +1 @@
-MD5 (bbkeys-0.3.6.tar.gz) = a8d24c463ea8900c4f5e5fdbc4ee8f9f
+MD5 (bbkeys-0.8.3.tar.gz) = f38ea900ad8c6a797833b4d380f737cd
diff --git a/x11-wm/bbkeys/files/patch-aa b/x11-wm/bbkeys/files/patch-aa
deleted file mode 100644
index 253950a0d6c..00000000000
--- a/x11-wm/bbkeys/files/patch-aa
+++ /dev/null
@@ -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 --git a/x11-wm/bbkeys/pkg-descr b/x11-wm/bbkeys/pkg-descr
index fea3de6240f..e643b470812 100644
--- a/x11-wm/bbkeys/pkg-descr
+++ b/x11-wm/bbkeys/pkg-descr
@@ -1,6 +1,3 @@
A keygrabber for the Blackbox window manager.
-WWW: http://movingparts.windsofstorm.net/
-
-- Patrick
-patseal@hyperhost.net
+WWW: http://movingparts.thelinuxcommunity.org/bbkeys.shtml
diff --git a/x11-wm/bbkeys/pkg-plist b/x11-wm/bbkeys/pkg-plist
index b90d40c70ed..f073a765cda 100644
--- a/x11-wm/bbkeys/pkg-plist
+++ b/x11-wm/bbkeys/pkg-plist
@@ -1,7 +1,10 @@
bin/bbkeys
bin/bbkeysConfigC
-bin/bbkeysconf
share/bbtools/bbkeys.bb
share/bbtools/bbkeys.nobb
share/bbtools/README.bbkeys
+%%PORTDOCS%%share/doc/bbkeys/README
+%%PORTDOCS%%share/doc/bbkeys/AUTHORS
+%%PORTDOCS%%share/doc/bbkeys/ChangeLog
+%%PORTDOCS%%@dirrm share/doc/bbkeys
@dirrm share/bbtools