CVS commit: pkgsrc/audio/wmmixer

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 24 11:28:29 UTC 2020

Modified Files:
        pkgsrc/audio/wmmixer: Makefile PLIST distinfo
Removed Files:
        pkgsrc/audio/wmmixer/patches: patch-aa patch-ab patch-ac

Log Message:
wmmixer: Update to 1.8

Changes (yes, this is the actual list):

Release 1.1   3 Apr 2002  Adopted as obviously orhpaned:
                             Gordon Fraser <gordon%debian.org@localhost>
                          Added mouse-wheel support
                          Rewrote parts of the X handling to make it work
                             with the KDE Dock Application Bar
                          Added manpage
                          Changed to GNU getopt command line parsing
                          Added simple Makefile, get rid of imake

Release 1.2   25 May 2002 Merge Debian patches
                          Cleanup/Splitup MixCtl
                          Preparing for major rewrite...
                          Makefile updated again

Release 1.3   26 May 2002 Change the whole thing to actual C++ code.
                          It is not yet pretty code, but it is a lot
                          better. Still, much work to do.

Release 1.4   08 Jun 2002 Display only one bar for mono channels
                          (Taken from Damian Kramer's wmsmixer)
                          Split X code up into smaller pieces
                          Fix channel rotating (repeat timer)
                          Add mute button

Release 1.5   25 Jun 2002 Several fixes (really open mixer device given
                          with -m, don't segfault when /dev/mixer is not
                          there, don't go to max if using scrollwheel to
                          set volume below 0)
                          Shaded LED-Bar
                          Initial Exception Handling

Release 1.6   13 Jul 2011 Support of multiple config files to run multiple
                          instances of wmmixer. Hurd support. Support of
                          XClasses. These patches was created first in Debian
                          01_restore_pristine_code.patch
                          02_multiple_config_files.patch
                          03_hurd_support.patch
                          04_xclass_support.patch

Release 1.7   19 Sep 2011 Fix FTBFS with ld --as-needed
                          Patch sent by Angel Abad <angelabad%ubuntu.com@localhost>

Release 1.8   28 Aug 2017 Update GPLv2 text
                          Update Free Software Foundation address.
                          Remove trailing whitespace.
                          Use autotools for build.
                          Add desktop entry file.
                          Update documentation.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/wmmixer/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/wmmixer/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/wmmixer/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/wmmixer/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/wmmixer/patches/patch-ab \
    pkgsrc/audio/wmmixer/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/wmmixer/Makefile
diff -u pkgsrc/audio/wmmixer/Makefile:1.20 pkgsrc/audio/wmmixer/Makefile:1.21
--- pkgsrc/audio/wmmixer/Makefile:1.20  Wed Oct 25 22:04:30 2017
+++ pkgsrc/audio/wmmixer/Makefile       Tue Nov 24 11:28:29 2020
@@ -1,33 +1,27 @@
-# $NetBSD: Makefile,v 1.20 2017/10/25 22:04:30 khorben Exp $
-#
+# $NetBSD: Makefile,v 1.21 2020/11/24 11:28:29 nia Exp $
 
-DISTNAME=      wmmixer-1.0-beta1
-PKGNAME=       wmmixer-1.0
-PKGREVISION=   2
+DISTNAME=      wmmixer-1.8
 CATEGORIES=    audio
-MASTER_SITES=  http://www.geocities.com/SiliconValley/Vista/2471/files/
-EXTRACT_SUFX=  .tgz
+MASTER_SITES=  https://www.dockapps.net/download/
 
 MAINTAINER=    pr%alles.prima.de@localhost
-HOMEPAGE=      http://www.geocities.com/SiliconValley/Vista/2471/
+HOMEPAGE=      https://www.dockapps.net/wmmixer
 COMMENT=       Mixer designed for WindowMaker (dockapp)
 LICENSE=       gnu-gpl-v2
 
-NOT_FOR_PLATFORM=      Interix-*-*
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++03
+USE_TOOLS+=    pkg-config
 
-WRKSRC=                        ${WRKDIR}/wmmixer
-USE_IMAKE=             YES
-USE_LANGUAGES=         c c++
-NO_INSTALL_MANPAGES=   YES
-
-MAKE_FLAGS+=           CCOPTIONS=${CFLAGS:Q}
-MAKE_FLAGS+=           CXXOPTIONS=${CFLAGS:Q}
-MAKE_FLAGS+=           LOCAL_LDFLAGS=${LDFLAGS:Q}
+.include "../../mk/oss.buildlink3.mk"
 
-pre-build:
-       ${TOUCH} ${WRKSRC}/wmmixer.man
+.if ${OSS_TYPE} == "none"
+PKG_SKIP_REASON+=      "Needs an OSS implementation"
+.else
+LDFLAGS+=              ${LIBOSSAUDIO}
+.endif
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/wmmixer/PLIST
diff -u pkgsrc/audio/wmmixer/PLIST:1.1 pkgsrc/audio/wmmixer/PLIST:1.2
--- pkgsrc/audio/wmmixer/PLIST:1.1      Thu Nov  1 00:18:09 2001
+++ pkgsrc/audio/wmmixer/PLIST  Tue Nov 24 11:28:29 2020
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/24 11:28:29 nia Exp $
 bin/wmmixer
+man/man1/wmmixer.1
+share/applications/wmmixer.desktop

Index: pkgsrc/audio/wmmixer/distinfo
diff -u pkgsrc/audio/wmmixer/distinfo:1.8 pkgsrc/audio/wmmixer/distinfo:1.9
--- pkgsrc/audio/wmmixer/distinfo:1.8   Tue Nov  3 01:12:54 2015
+++ pkgsrc/audio/wmmixer/distinfo       Tue Nov 24 11:28:29 2020
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:12:54 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/11/24 11:28:29 nia Exp $
 
-SHA1 (wmmixer-1.0-beta1.tgz) = b8695455e1a7364aa337feb924f059db9a5856fe
-RMD160 (wmmixer-1.0-beta1.tgz) = 5edea21f2154ebce018b7c34d9f05892acab16d4
-SHA512 (wmmixer-1.0-beta1.tgz) = b2e3582f27157704a37075fa98e8ad61e3809dcbebbd7548291a63301f9416bd1d5a423be68781dcf6bbab55b873bd4fded37bfc207070bd9f7da7f1f74d116b
-Size (wmmixer-1.0-beta1.tgz) = 18801 bytes
-SHA1 (patch-aa) = 4ee2ac096da6ee07a5e917242a6066c842dfa4d4
-SHA1 (patch-ab) = 7fd4f67cd2bf121fd33d6cbefc1067172644da14
-SHA1 (patch-ac) = 3f99147736d5e8009ef95a93b63ee32ea9617f3a
+SHA1 (wmmixer-1.8.tar.gz) = d93af3581e6c39a33b890259850567a6fd904847
+RMD160 (wmmixer-1.8.tar.gz) = a0089a8a9c4d98295578035b035f1a88506072da
+SHA512 (wmmixer-1.8.tar.gz) = 3b5c7f27da6ed2cbf8d06c431584186799d17e72db663db6ffc488f777c31de0b13fcc3f665099925efab036a14e70da4bbbabaff6ffc12280698e91f555e276
+Size (wmmixer-1.8.tar.gz) = 102723 bytes