From 92addbc4604ca6dd8bc3f6eb75f07b0368a6483b Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 22 Oct 2004 18:30:42 +0000 Subject: 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. --- audio/Makefile | 3 ++- audio/aumix-gtk/DESCR | 5 +++++ audio/aumix-gtk/Makefile | 15 +++++++++++++++ audio/aumix/DESCR | 7 +++---- audio/aumix/Makefile | 28 +++++----------------------- audio/aumix/Makefile.common | 32 ++++++++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 audio/aumix-gtk/DESCR create mode 100644 audio/aumix-gtk/Makefile create mode 100644 audio/aumix/Makefile.common (limited to 'audio') diff --git a/audio/Makefile b/audio/Makefile index 2b57d93a815..d7d4da17c8a 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -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+= applerecords SUBDIR+= arts SUBDIR+= audacity SUBDIR+= aumix +SUBDIR+= aumix-gtk SUBDIR+= bladeenc SUBDIR+= bmp SUBDIR+= bmp-esound diff --git a/audio/aumix-gtk/DESCR b/audio/aumix-gtk/DESCR new file mode 100644 index 00000000000..5af2f29ce0c --- /dev/null +++ b/audio/aumix-gtk/DESCR @@ -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 --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile new file mode 100644 index 00000000000..c2f2742a375 --- /dev/null +++ b/audio/aumix-gtk/Makefile @@ -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 --git a/audio/aumix/DESCR b/audio/aumix/DESCR index d7d8f3853e7..89464b0eccb 100644 --- a/audio/aumix/DESCR +++ b/audio/aumix/DESCR @@ -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 +This package is built with ncurses support only. diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index 4c9b6f22101..c09bd433749 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -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" -MAINTAINER= trevor@jpj.net -HOMEPAGE= http://jpj.net/~trevor/aumix.html -COMMENT= Set mix levels +PKGREVISION= 6 -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 --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common new file mode 100644 index 00000000000..124d98e4f55 --- /dev/null +++ b/audio/aumix/Makefile.common @@ -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 +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" -- cgit v1.2.3