summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wm/amiwm/Makefile3
-rw-r--r--wm/bbkeys/Makefile4
-rw-r--r--wm/bbpager/Makefile4
-rw-r--r--wm/bbrun/Makefile7
-rw-r--r--wm/blackbox70/Makefile6
-rw-r--r--wm/ctwm/Makefile9
-rw-r--r--wm/musca/DESCR6
7 files changed, 17 insertions, 22 deletions
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index f31bb2a38c3..e9fa2e9b52c 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/23 10:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2013/08/15 20:26:51 rillig Exp $
#
DISTNAME= amiwm0.20pl48
@@ -30,7 +30,6 @@ CONFIGURE_ENV+= X_PRE_LIBS=${X_PRE_LIBS:Q}
CONFIGURE_ENV+= X_EXTRA_LIBS=-lXt
X_PRE_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-FIX_RPATH+= X_PRE_LIBS
INSTALLATION_DIRS= bin
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index d142bd07bd6..98f6358d366 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/05/31 12:42:29 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/08/15 20:26:51 rillig Exp $
#
DISTNAME= bbkeys-0.8.6
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://bbkeys.sourceforge.net/
COMMENT= General X Window keygrabber
-CONFLICTS+= bbkeys09-*
+CONFLICTS+= bbkeys09-[0-9]*
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index 2739a7dbec7..de59a0ac1a3 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/08 12:42:17 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/08/15 20:26:51 rillig Exp $
#
DISTNAME= bbpager-0.3.1
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml
COMMENT= Pager for the blackbox window manager
-CONFLICTS+= bbpager04-*
+CONFLICTS+= bbpager04-[0-9]*
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index 6f1fd6655fa..588073604a8 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/08 12:42:18 asau Exp $
+# $NetBSD: Makefile,v 1.22 2013/08/15 20:26:51 rillig Exp $
DISTNAME= bbrun-1.3
PKGREVISION= 5
@@ -11,14 +11,11 @@ COMMENT= Run utility for BlackBox
WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun
USE_TOOLS+= gmake
-
BUILD_TARGET= bbrun
-
-INSTALLATION_DIRS= bin share/doc/bbrun
+AUTO_MKDIRS= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bbrun ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bbrun
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${DESTDIR}${PREFIX}/share/doc/bbrun
.include "../../x11/gtk/buildlink3.mk"
diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile
index 38160c7bc7c..bb904798597 100644
--- a/wm/blackbox70/Makefile
+++ b/wm/blackbox70/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 12:42:18 asau Exp $
+# $NetBSD: Makefile,v 1.9 2013/08/15 20:26:51 rillig Exp $
#
DISTNAME= blackbox-0.70.1
@@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://blackboxwm.sourceforge.net/
COMMENT= Small and fast X11R6 window manager
-CONFLICTS= bsetroot-*
-CONFLICTS+= blackbox-*
+CONFLICTS= bsetroot-[0-9]*
+CONFLICTS+= blackbox-[0-9]*
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index c68d1f19c3a..065328ded05 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/06/09 15:26:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2013/08/15 20:26:51 rillig Exp $
#
DISTNAME= ctwm-3.8.1
@@ -22,6 +22,7 @@ EXTRA_DEFINES+= -DPATH_TO_M4=\"${TOOLS_PATH.gm4:Q}\"
# The __EXTENSIONS__ is needed for sigjmp_buf.
EXTRA_DEFINES.SunOS+= -D__EXTENSIONS__
MAKE_ENV+= EXTRA_DEFINES=${EXTRA_DEFINES:Q}
+AUTO_MKDIRS= yes
pre-configure:
( ${ECHO} 'USER_JPEGLIBDIR = -L${JPEGBASE}/lib ${COMPILER_RPATH_FLAG}${JPEGBASE}/lib'; \
@@ -29,14 +30,10 @@ pre-configure:
${CAT} ${WRKSRC}/Imakefile.local-template; \
) >${WRKSRC}/Imakefile.local
-EXAMPLEDIR=${PREFIX}/share/examples/ctwm
-
pre-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR}
.for f in example.ctwmrc levitte.ctwmrc peterc.ctwmrc system.ctwmrc system.ctwmrc.gnome
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/ctwm/
.endfor
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xsessions
${INSTALL_DATA} ${FILESDIR}/ctwm.desktop \
${DESTDIR}${PREFIX}/share/xsessions/ctwm.desktop
diff --git a/wm/musca/DESCR b/wm/musca/DESCR
index 182023b15d9..7477346d456 100644
--- a/wm/musca/DESCR
+++ b/wm/musca/DESCR
@@ -3,13 +3,15 @@ Simple dynamic window manager for X with features nicked from ratpoison and dwm:
* Musca operates as a tiling window manager by default. It uses manual tiling,
which means the user determines how the screen is divided into
non-overlapping frames, with no restrictions on layout. Application windows
- always fill their assigned frame, with the exception of transient windows and popup dialog boxes which float above their parent application at the
+ always fill their assigned frame, with the exception of transient windows and
+ popup dialog boxes which float above their parent application at the
appropriate size. Once visible, applications do not change frames unless so
instructed.
* Since not all applications suit tiling, a more traditional stacking window
manager mode is also available, allowing windows to float at any screen
location and overlap.
- * There are no built in status bars, panels, tabs or window decorations to take up screen real estate. If the user wants any of these things, there are
+ * There are no built in status bars, panels, tabs or window decorations to take
+ up screen real estate. If the user wants any of these things, there are
plenty of external applications available to do the job. Window decoration is
limited to a slender border, which is coloured to indicate keyboard focus.
* Windows are placed in named groups which can be used in a similar fashion to