pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Split aumix into two different packages:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3578352b83f
branches:  trunk
changeset: 482228:d3578352b83f
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri Oct 22 18:30:42 2004 +0000

description:
Split aumix into two different packages:
- aumix 2.8nb6, which only provides ncurses support.  Note that its revision
  is bumped to note the differences from the previous package.
- aumix-gtk 2.8, which includes GTK 2.x and ncurses support.  While here,
  add a missing build dependency on pkgconfig.

The descriptions have also been rewritten to note the differences.

Addresses PR pkg/27340.

diffstat:

 audio/Makefile              |   3 ++-
 audio/aumix-gtk/DESCR       |   5 +++++
 audio/aumix-gtk/Makefile    |  15 +++++++++++++++
 audio/aumix/DESCR           |   7 +++----
 audio/aumix/Makefile        |  30 ++++++------------------------
 audio/aumix/Makefile.common |  32 ++++++++++++++++++++++++++++++++
 doc/CHANGES                 |   4 +++-
 7 files changed, 66 insertions(+), 30 deletions(-)

diffs (147 lines):

diff -r 14bcd0a89806 -r d3578352b83f audio/Makefile
--- a/audio/Makefile    Fri Oct 22 18:25:07 2004 +0000
+++ b/audio/Makefile    Fri Oct 22 18:30:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.254 2004/10/19 03:13:52 ben Exp $
+# $NetBSD: Makefile,v 1.255 2004/10/22 18:30:42 jmmv Exp $
 #
 
 COMMENT=       Audio tools
@@ -14,6 +14,7 @@
 SUBDIR+=       arts
 SUBDIR+=       audacity
 SUBDIR+=       aumix
+SUBDIR+=       aumix-gtk
 SUBDIR+=       bladeenc
 SUBDIR+=       bmp
 SUBDIR+=       bmp-esound
diff -r 14bcd0a89806 -r d3578352b83f audio/aumix-gtk/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/aumix-gtk/DESCR     Fri Oct 22 18:30:42 2004 +0000
@@ -0,0 +1,5 @@
+Aumix lets you adjust all the values from your audio mixer from an easy to
+use interface.
+
+This package is built with ncurses and GTK+ 2.0 support, to be used from the
+console or from within a graphical environment.
diff -r 14bcd0a89806 -r d3578352b83f audio/aumix-gtk/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/aumix-gtk/Makefile  Fri Oct 22 18:30:42 2004 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2004/10/22 18:30:43 jmmv Exp $
+
+.include "../../audio/aumix/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/aumix/aumix-gtk/}
+
+COMMENT+=      (ncurses and GTK+ 2.0 interfaces)
+
+CONFLICTS=     aumix-[0-9]*
+
+CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/^--without-gtk$//}
+
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 14bcd0a89806 -r d3578352b83f audio/aumix/DESCR
--- a/audio/aumix/DESCR Fri Oct 22 18:25:07 2004 +0000
+++ b/audio/aumix/DESCR Fri Oct 22 18:30:42 2004 +0000
@@ -1,5 +1,4 @@
-This program adjusts an audio mixer from X, the console, a terminal,
-the command line or a script.  Interactive use is with GTK+ and
-ncurses.
+Aumix lets you adjust all the values from your audio mixer from an easy to
+use interface.
 
-Trevor Johnson <trevor%jpj.net@localhost>
+This package is built with ncurses support only.
diff -r 14bcd0a89806 -r d3578352b83f audio/aumix/Makefile
--- a/audio/aumix/Makefile      Fri Oct 22 18:25:07 2004 +0000
+++ b/audio/aumix/Makefile      Fri Oct 22 18:30:42 2004 +0000
@@ -1,29 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: Makefile,v 1.23 2004/10/22 18:30:43 jmmv Exp $
 
-DISTNAME=      aumix-2.8
-PKGREVISION=   5
-CATEGORIES=    audio
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=aumix/} \
-               http://jpj.net/~trevor/aumix/ \
-               ${MASTER_SITE_SUNSITE:=apps/sound/mixers/} \
-               ftp://aumix.sourceforge.net/pub/aumix/stable/ \
-               http://jpj.net/~trevor/aumix/old/
-EXTRACT_SUFX=  .tar.bz2
+.include "Makefile.common"
+
+PKGREVISION=   6
 
-MAINTAINER=    trevor%jpj.net@localhost
-HOMEPAGE=      http://jpj.net/~trevor/aumix.html
-COMMENT=       Set mix levels
-
-BUILD_USES_MSGFMT=     yes
+COMMENT+=      (ncurses interface only)
 
-USE_BUILDLINK3=                yes
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-own-labels
-CONFIGURE_ARGS+=       --enable-nls
-CONFIGURE_ARGS+=       --without-gtk1
+CONFLICTS=     aumix-gtk-[0-9]*
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 14bcd0a89806 -r d3578352b83f audio/aumix/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/aumix/Makefile.common       Fri Oct 22 18:30:42 2004 +0000
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile.common,v 1.1 2004/10/22 18:30:43 jmmv Exp $
+
+DISTNAME=      aumix-2.8
+CATEGORIES=    audio
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=aumix/} \
+               http://jpj.net/~trevor/aumix/ \
+               ${MASTER_SITE_SUNSITE:=apps/sound/mixers/} \
+               ftp://aumix.sourceforge.net/pub/aumix/stable/ \
+               http://jpj.net/~trevor/aumix/old/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    trevor%jpj.net@localhost
+HOMEPAGE=      http://jpj.net/~trevor/aumix.html
+COMMENT=       Set mix levels
+
+BUILD_USES_MSGFMT=     yes
+
+DISTINFO_FILE=         ${.CURDIR}/../../audio/aumix/distinfo
+PATCHDIR=              ${.CURDIR}/../../audio/aumix/patches
+PLIST_SRC=             ${.CURDIR}/../../audio/aumix/PLIST
+
+USE_BUILDLINK3=                yes
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+
+CONFIGURE_ARGS+=       --enable-own-labels
+CONFIGURE_ARGS+=       --enable-nls
+CONFIGURE_ARGS+=       --without-gtk1
+CONFIGURE_ARGS+=       --without-gtk
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
diff -r 14bcd0a89806 -r d3578352b83f doc/CHANGES
--- a/doc/CHANGES       Fri Oct 22 18:25:07 2004 +0000
+++ b/doc/CHANGES       Fri Oct 22 18:30:42 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7525 2004/10/22 18:25:07 jmmv Exp $
+$NetBSD: CHANGES,v 1.7526 2004/10/22 18:30:42 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -4817,3 +4817,5 @@
        Updated nail to 11.12 [cjep 2004-10-22]
        Updated evolution-data-server to 1.0.2nb2 [jmmv 2004-10-22]
        Updated kmymoney2 to 0.6.2 [jdolecek 2004-10-22]
+       Updated aumix to 2.8nb6 [jmmv 2004-10-22]
+       Added aumix-gtk-2.8 [jmmv 2004-10-22]



Home | Main Index | Thread Index | Old Index