diff options
author | nia <nia@pkgsrc.org> | 2020-02-26 17:23:42 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-02-26 17:23:42 +0000 |
commit | f20519d089ddd74baf3d951da2744d01f0f55df5 (patch) | |
tree | d22fb76a2b83738abf6600190747257e631f1019 /wm | |
parent | 2e885e60a6bf9fb61414986e0e7fcf2d7a2c6f1e (diff) | |
download | pkgsrc-f20519d089ddd74baf3d951da2744d01f0f55df5.tar.gz |
vtwm: Update to 5.5.0
Unknown changes. Switch to GNU build system from imake.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/vtwm/Makefile | 42 | ||||
-rw-r--r-- | wm/vtwm/PLIST | 7 | ||||
-rw-r--r-- | wm/vtwm/distinfo | 12 | ||||
-rw-r--r-- | wm/vtwm/patches/patch-aa | 22 | ||||
-rw-r--r-- | wm/vtwm/patches/patch-ab | 13 |
5 files changed, 40 insertions, 56 deletions
diff --git a/wm/vtwm/Makefile b/wm/vtwm/Makefile index b21fda9e898..6831b56b53b 100644 --- a/wm/vtwm/Makefile +++ b/wm/vtwm/Makefile @@ -1,23 +1,43 @@ -# $NetBSD: Makefile,v 1.12 2012/10/23 10:24:15 wiz Exp $ -# +# $NetBSD: Makefile,v 1.13 2020/02/26 17:23:42 nia Exp $ -DISTNAME= vtwm-5.4.7 -PKGREVISION= 3 -CATEGORIES= x11 wm -MASTER_SITES= http://www.vtwm.org/downloads/ +DISTNAME= vtwm-5.5.0 +CATEGORIES= wm x11 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vtwm/} MAINTAINER= mehul.sanghvi@gmail.com -HOMEPAGE= http://www.vtwm.org/downloads/ +HOMEPAGE= http://www.vtwm.org/ COMMENT= TWM with virtual desktop, m4, sound and 3-D buttons +LICENSE= x11 -MAKE_JOBS_SAFE= no +GNU_CONFIGURE= yes -USE_IMAKE= YES -USE_TOOLS+= flex yacc +USE_TOOLS+= pkg-config flex bison m4 -.include "../../audio/rplay/buildlink3.mk" +CONFIGURE_ARGS+= --disable-esd-sound +CONFIGURE_ARGS+= --disable-rplay-sound + +.include "../../mk/oss.buildlink3.mk" + +.if ${OSS_TYPE} != "none" +SUBST_CLASSES+= oss +SUBST_STAGE.oss= pre-configure +SUBST_MESSAGE.oss= Fixing default OSS device references. +SUBST_FILES.oss+= configure +SUBST_FILES.oss+= sound.c +SUBST_SED.oss= -e 's,/dev/dsp,${DEVOSSAUDIO},' + +CONFIGURE_ARGS+= --enable-oss-sound +LIBS+= ${LIBOSSAUDIO} +.else +CONFIGURE_ARGS+= --disable-oss-sound +.endif + +.include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXrandr/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/vtwm/PLIST b/wm/vtwm/PLIST index 597a43b5c17..8cc0ba76054 100644 --- a/wm/vtwm/PLIST +++ b/wm/vtwm/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:19:02 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2020/02/26 17:23:42 nia Exp $ +bin/nexpm bin/vtwm -lib/X11/vtwm/system.vtwmrc -${IMAKE_MAN_DIR}/vtwm.${IMAKE_MAN_SUFFIX} +man/man1/vtwm.1 +share/X11/vtwm/system.vtwmrc diff --git a/wm/vtwm/distinfo b/wm/vtwm/distinfo index a86380311ec..cdbbf2a5fef 100644 --- a/wm/vtwm/distinfo +++ b/wm/vtwm/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.3 2015/11/02 23:42:55 agc Exp $ +$NetBSD: distinfo,v 1.4 2020/02/26 17:23:42 nia Exp $ -SHA1 (vtwm-5.4.7.tar.gz) = 6165b4a1f167b50dee0cf0526011fe4ab8123f8c -RMD160 (vtwm-5.4.7.tar.gz) = 9ab71147abdbaea9f95a2528595b79a3faf49834 -SHA512 (vtwm-5.4.7.tar.gz) = abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728 -Size (vtwm-5.4.7.tar.gz) = 1021160 bytes -SHA1 (patch-aa) = b1bff2a3438b5f0ccad5bfa5d1603de95a4a0c30 -SHA1 (patch-ab) = 318c5ff0c04586de089670934e2703d99434df79 +SHA1 (vtwm-5.5.0.tar.gz) = 04129d93ace26a34dd59b1ff652bea661fcfe0c8 +RMD160 (vtwm-5.5.0.tar.gz) = 5bb43578091c1283212774fb4893d77b13b87fff +SHA512 (vtwm-5.5.0.tar.gz) = cf0b7bc2c007fea9df909d695098cc5ab5ab9fbb83b58264a3fc380aa5db83411c3ebec9f238fb23fdfcacdf9ae289ece7c14831d6839e606031d587fc7d73af +Size (vtwm-5.5.0.tar.gz) = 1141664 bytes diff --git a/wm/vtwm/patches/patch-aa b/wm/vtwm/patches/patch-aa deleted file mode 100644 index 3ea2fba0318..00000000000 --- a/wm/vtwm/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2006/01/02 22:13:26 joerg Exp $ - ---- Imakefile.orig 2005-05-09 12:46:24.000000000 +0000 -+++ Imakefile -@@ -28,7 +28,7 @@ XCOMM (the library must conform to the P - XCOMM To omit sound support, uncomment this - XCOMM NO_SOUND_SUPPORT = -DNO_SOUND_SUPPORT - XCOMM and comment these --SOUNDLIB = -L/usr/local/lib -lrplay -+SOUNDLIB = -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lrplay - SOUNDINC = -I/usr/local/include - XCOMM (sound is supported only by way of the rplay library) - -@@ -57,7 +57,7 @@ XCOMM Installation path for the binary - VTWMBINDIR = $(BINDIR) - - XCOMM Installation path for the system resource file -- VTWMLIBDIR = $(LIBDIR)/twm -+ VTWMLIBDIR = $(LIBDIR)/vtwm - - XCOMM Installation path for the man page - VTWMMANDIR = $(MANDIR) diff --git a/wm/vtwm/patches/patch-ab b/wm/vtwm/patches/patch-ab deleted file mode 100644 index a05510fe4f8..00000000000 --- a/wm/vtwm/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/11/06 00:43:11 minskim Exp $ - ---- gram.y.orig 2005-05-16 21:19:48.000000000 -0400 -+++ gram.y -@@ -116,7 +116,7 @@ extern int SetSound(); - * - * djhjr - 1/16/98 - */ --extern int yylineno; -+int yylineno; - - %} - |