From 7e278dca26a90a0e8c3f6e2898d76399b77db2e2 Mon Sep 17 00:00:00 2001 From: rpe Date: Mon, 1 Apr 2013 17:16:32 +0000 Subject: [PATCH] remove -bmp subpackage, audio/bmp is gone ok aja@ --- audio/xmp/Makefile | 16 +++------------- audio/xmp/pkg/DESCR-bmp | 4 ---- audio/xmp/pkg/PLIST-bmp | 4 ---- audio/xmp/pkg/PLIST-main | 4 +++- 4 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 audio/xmp/pkg/DESCR-bmp delete mode 100644 audio/xmp/pkg/PLIST-bmp diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index 2cc550721b9..b69c62d15bc 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.49 2013/03/10 22:55:06 espie Exp $ +# $OpenBSD: Makefile,v 1.50 2013/04/01 17:16:32 rpe Exp $ SHARED_ONLY= Yes COMMENT-main= extended module player -COMMENT-bmp= extended module player plugin for BMP COMMENT-xmms= extended module player plugin for XMMS DISTNAME= xmp-3.5.0 PKGNAME-main= ${DISTNAME} -PKGNAME-bmp= bmp-${DISTNAME} +REVISION-main= 0 PKGNAME-xmms= xmms-${DISTNAME} CATEGORIES= audio @@ -19,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/} -MULTI_PACKAGES= -main -bmp -xmms +MULTI_PACKAGES= -main -xmms MODULES= devel/gettext @@ -32,15 +31,6 @@ LIB_DEPENDS-main= # empty RUN_DEPENDS-main= # empty WANTLIB-main= c m sndio -LIB_DEPENDS-bmp= audio/bmp -WANTLIB-bmp= GL X11 Xcomposite Xcursor Xdamage Xext Xfixes \ - Xi Xinerama Xrandr Xrender atk-1.0 beep cairo \ - expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \ - gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ - gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pixman-1 png pthread-stubs xcb xcb-render xcb-shm z \ - ${MODGETTEXT_WANTLIB} - LIB_DEPENDS-xmms= audio/xmms WANTLIB-xmms= X11 Xext Xi gdk glib gmodule gtk m xmms ${MODGETTEXT_WANTLIB} diff --git a/audio/xmp/pkg/DESCR-bmp b/audio/xmp/pkg/DESCR-bmp deleted file mode 100644 index 4e96ea97198..00000000000 --- a/audio/xmp/pkg/DESCR-bmp +++ /dev/null @@ -1,4 +0,0 @@ -xmp is a multi-format module player for UNIX. It supports more -than 40 module formats, such as Soundtracker, Impulse Tracker, etc. - -This is an BMP input plugin based on xmp. diff --git a/audio/xmp/pkg/PLIST-bmp b/audio/xmp/pkg/PLIST-bmp deleted file mode 100644 index 18ad3653774..00000000000 --- a/audio/xmp/pkg/PLIST-bmp +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PLIST-bmp,v 1.2 2010/08/23 18:13:58 jasper Exp $ -lib/bmp/ -lib/bmp/Input/ -lib/bmp/Input/xmp-bmp.so diff --git a/audio/xmp/pkg/PLIST-main b/audio/xmp/pkg/PLIST-main index 58eb11609be..c795bc0f0a5 100644 --- a/audio/xmp/pkg/PLIST-main +++ b/audio/xmp/pkg/PLIST-main @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-main,v 1.3 2010/08/23 18:13:58 jasper Exp $ +@comment $OpenBSD: PLIST-main,v 1.4 2013/04/01 17:16:32 rpe Exp $ +@conflict xmp-bmp-* +@pkgpath audio/xmp,-bmp @pkgpath audio/xmp,no_xmms @pkgpath audio/xmp @bin bin/xmp