diff options
author | B. Watson <yalhcru@gmail.com> | 2018-09-14 14:41:30 -0400 |
---|---|---|
committer | David Spencer <idlemoor@slackbuilds.org> | 2018-09-15 19:23:41 +0100 |
commit | d0a9c5fb70200a5557de32f6ed59715982884dc1 (patch) | |
tree | 6dacca17a792901c97098b8865fccdfa01398461 /desktop/cwm | |
parent | f60fa5eba4a61bdce3f82672ec008bd6e03f6e6f (diff) | |
download | slackbuilds-d0a9c5fb70200a5557de32f6ed59715982884dc1.tar.gz |
desktop/cwm: Actually use SLKCFLAGS.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'desktop/cwm')
-rw-r--r-- | desktop/cwm/README | 7 | ||||
-rw-r--r-- | desktop/cwm/cwm.SlackBuild | 33 | ||||
-rw-r--r-- | desktop/cwm/cwm.info | 2 | ||||
-rw-r--r-- | desktop/cwm/slack-desc | 6 |
4 files changed, 25 insertions, 23 deletions
diff --git a/desktop/cwm/README b/desktop/cwm/README index 39aebfbfe8..81b89e2ece 100644 --- a/desktop/cwm/README +++ b/desktop/cwm/README @@ -1,9 +1,10 @@ -This is a port of OpenBSD's excellent cwm to Linux and other -Unices. +cwm (OpenBSD's cwm X11 window manager) + +This is a port of OpenBSD's excellent cwm to Linux and other Unices. cwm is a window manager for X11 which contains many features that concentrate on the efficiency and transparency of window -management. cwm also aims to maintain the simplest and most +management. cwm also aims to maintain the simplest and most pleasant aesthetic. This version actively tracks changes in the OpenBSD CVS repository. diff --git a/desktop/cwm/cwm.SlackBuild b/desktop/cwm/cwm.SlackBuild index b439546932..dfe11415a0 100644 --- a/desktop/cwm/cwm.SlackBuild +++ b/desktop/cwm/cwm.SlackBuild @@ -23,11 +23,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20180914 bkw: +# - actually use SLKCFLAGS (BUILD=2). +# - minor script simplification/cleanup. +# - switch to github download link for ease of version tracking. + # 20180802 bkw: take over maintenance, no script changes. PRGNAM=cwm VERSION=${VERSION:-6.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -66,24 +71,20 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -make PREFIX=/usr \ -MANPREFIX=/usr/man \ -DESTDIR="$PKG" \ -install +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -install -m 0755 -D $CWD/xinitrc.cwm $PKG/etc/X11/xinit/xinitrc.cwm +sed -i "s,-O2,$SLKCFLAGS," Makefile -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +make \ + PREFIX=/usr \ + MANPREFIX=/usr/man \ + DESTDIR="$PKG" \ + install -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +strip $PKG/usr/bin/$PRGNAM +gzip -9 $PKG/usr/man/man?/*.? +install -m 0755 -D $CWD/xinitrc.$PRGNAM $PKG/etc/X11/xinit/xinitrc.$PRGNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/cwm/cwm.info b/desktop/cwm/cwm.info index 691d637432..588ada66d2 100644 --- a/desktop/cwm/cwm.info +++ b/desktop/cwm/cwm.info @@ -1,7 +1,7 @@ PRGNAM="cwm" VERSION="6.3" HOMEPAGE="https://github.com/chneukirchen/cwm" -DOWNLOAD="http://chneukirchen.org/releases/cwm-6.3.tar.gz" +DOWNLOAD="https://github.com/chneukirchen/cwm/archive/v6.3/cwm-6.3.tar.gz" MD5SUM="358ad04e4299f816f8fb8fdc0b00c179" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/desktop/cwm/slack-desc b/desktop/cwm/slack-desc index b94841c2bd..06dfbe941e 100644 --- a/desktop/cwm/slack-desc +++ b/desktop/cwm/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| cwm: cwm (OpenBSD's cwm X11 window manager) cwm: -cwm: This is a port of OpenBSD's excellent cwm to Linux and other -cwm: Unices. +cwm: This is a port of OpenBSD's excellent cwm to Linux and other Unices. cwm: cwm: cwm is a window manager for X11 which contains many features that cwm: concentrate on the efficiency and transparency of window -cwm: management. cwm also aims to maintain the simplest and most +cwm: management. cwm also aims to maintain the simplest and most cwm: pleasant aesthetic. cwm: cwm: Homepage: https://github.com/chneukirchen/cwm +cwm: |