allegro: Remove (for wrong build system) esound support. Add alsa and jack.

Bump PKGREVISION because this changes default options (on Linux only)

5 files changed, 60 insertions, 40 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 09329992ff7..e73b618a6ab 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2019/06/18 17:38:18 nia Exp $
+# $NetBSD: Makefile,v 1.42 2020/01/20 21:32:59 nia Exp $
 
 DISTNAME=	allegro-4.4.3.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=liballeg/}
 GITHUB_PROJECT=	allegro5
@@ -18,9 +19,11 @@ USE_LANGUAGES=	c c++
 INFO_FILES=	yes
 CMAKE_ARGS+=	-DINFODIR=${PKGINFODIR:Q}
 
+PLIST_SUBST+=	ALLEG_VER=${PKGVERSION_NOREV:R}
+
 SUBST_CLASSES.NetBSD+=	ossmidi
 SUBST_STAGE.ossmidi=	pre-configure
-SUBST_MESSAGE.ossmidi=	NetBSD's OSS midi emulation is non-existent.
+SUBST_MESSAGE.ossmidi=	NetBSD OSS midi emulation is non-existent.
 SUBST_FILES.ossmidi=	CMakeLists.txt
 SUBST_SED.ossmidi=	-e 's/ALLEGRO_WITH_OSSMIDI 1/ALLEGRO_WITH_OSSMIDI 0/'
 
@@ -35,6 +38,7 @@ INSTALLATION_DIRS=	share/aclocal
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/allegro.m4 ${DESTDIR}${PREFIX}/share/aclocal
 
+.include "options.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
@@ -50,5 +54,4 @@ post-install:
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST
index aaf41e33561..3cedc37d067 100644
--- a/devel/allegro/PLIST
+++ b/devel/allegro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/06/18 17:38:18 nia Exp $
+@comment $NetBSD: PLIST,v 1.16 2020/01/20 21:32:59 nia Exp $
 bin/allegro-config
 bin/colormap
 bin/dat
@@ -117,47 +117,47 @@ include/loadpng.h
 include/logg.h
 include/xalleg.h
 info/allegro.info
-lib/allegro/4.4.3/alleg-dga2.so
-lib/allegro/4.4.3/modules.lst
+lib/allegro/${ALLEG_VER}/alleg-dga2.so
+lib/allegro/${ALLEG_VER}/modules.lst
 lib/liballeg.so
 lib/liballeg.so.4.4
-lib/liballeg.so.4.4.3
+lib/liballeg.so.${ALLEG_VER}
 lib/liballeggl.so
 lib/liballeggl.so.4.4
-lib/liballeggl.so.4.4.3
+lib/liballeggl.so.${ALLEG_VER}
 lib/libjpgalleg.so
 lib/libjpgalleg.so.4.4
-lib/libjpgalleg.so.4.4.3
+lib/libjpgalleg.so.${ALLEG_VER}
 lib/libloadpng.so
 lib/libloadpng.so.4.4
-lib/libloadpng.so.4.4.3
+lib/libloadpng.so.${ALLEG_VER}
 lib/liblogg.so
 lib/liblogg.so.4.4
-lib/liblogg.so.4.4.3
+lib/liblogg.so.${ALLEG_VER}
 lib/pkgconfig/allegro.pc
 lib/pkgconfig/allegrogl.pc
 lib/pkgconfig/jpgalleg.pc
 lib/pkgconfig/loadpng.pc
 lib/pkgconfig/logg.pc
 share/aclocal/allegro.m4
-share/doc/allegro-4.4.3/AUTHORS
-share/doc/allegro-4.4.3/CHANGES
-share/doc/allegro-4.4.3/THANKS
-share/doc/allegro-4.4.3/abi.txt
-share/doc/allegro-4.4.3/addons.txt
-share/doc/allegro-4.4.3/ahack.txt
-share/doc/allegro-4.4.3/allegro.txt
-share/doc/allegro-4.4.3/api.txt
-share/doc/allegro-4.4.3/const.txt
-share/doc/allegro-4.4.3/dat.txt
-share/doc/allegro-4.4.3/dat2c.txt
-share/doc/allegro-4.4.3/dat2s.txt
-share/doc/allegro-4.4.3/datafile.txt
-share/doc/allegro-4.4.3/faq.txt
-share/doc/allegro-4.4.3/grabber.txt
-share/doc/allegro-4.4.3/help.txt
-share/doc/allegro-4.4.3/license.txt
-share/doc/allegro-4.4.3/makedoc.txt
-share/doc/allegro-4.4.3/mistakes.txt
-share/doc/allegro-4.4.3/packfile.txt
-share/doc/allegro-4.4.3/readme.txt
+share/doc/allegro-${ALLEG_VER}/AUTHORS
+share/doc/allegro-${ALLEG_VER}/CHANGES
+share/doc/allegro-${ALLEG_VER}/THANKS
+share/doc/allegro-${ALLEG_VER}/abi.txt
+share/doc/allegro-${ALLEG_VER}/addons.txt
+share/doc/allegro-${ALLEG_VER}/ahack.txt
+share/doc/allegro-${ALLEG_VER}/allegro.txt
+share/doc/allegro-${ALLEG_VER}/api.txt
+share/doc/allegro-${ALLEG_VER}/const.txt
+share/doc/allegro-${ALLEG_VER}/dat.txt
+share/doc/allegro-${ALLEG_VER}/dat2c.txt
+share/doc/allegro-${ALLEG_VER}/dat2s.txt
+share/doc/allegro-${ALLEG_VER}/datafile.txt
+share/doc/allegro-${ALLEG_VER}/faq.txt
+share/doc/allegro-${ALLEG_VER}/grabber.txt
+share/doc/allegro-${ALLEG_VER}/help.txt
+share/doc/allegro-${ALLEG_VER}/license.txt
+share/doc/allegro-${ALLEG_VER}/makedoc.txt
+share/doc/allegro-${ALLEG_VER}/mistakes.txt
+share/doc/allegro-${ALLEG_VER}/packfile.txt
+share/doc/allegro-${ALLEG_VER}/readme.txt
diff --git a/devel/allegro/PLIST.alsa b/devel/allegro/PLIST.alsa
new file mode 100644
index 00000000000..40551f18def
--- /dev/null
+++ b/devel/allegro/PLIST.alsa
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.alsa,v 1.1 2020/01/20 21:32:59 nia Exp $
+lib/allegro/${ALLEG_VER}/alleg-alsadigi.so
+lib/allegro/${ALLEG_VER}/alleg-alsamidi.so
diff --git a/devel/allegro/PLIST.jack b/devel/allegro/PLIST.jack
new file mode 100644
index 00000000000..c425ac79c8c
--- /dev/null
+++ b/devel/allegro/PLIST.jack
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.jack,v 1.1 2020/01/20 21:32:59 nia Exp $
+lib/allegro/${ALLEG_VER}/alleg-jack.so
diff --git a/devel/allegro/options.mk b/devel/allegro/options.mk
index e7a87235b6c..069aba06929 100644
--- a/devel/allegro/options.mk
+++ b/devel/allegro/options.mk
@@ -1,14 +1,26 @@
-# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2020/01/20 21:32:59 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.allegro
-PKG_SUPPORTED_OPTIONS=	esound
+PKG_OPTIONS_VAR=		PKG_OPTIONS.allegro
+PKG_SUPPORTED_OPTIONS=		alsa jack
+PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		esound
+PLIST_SRC+=	PLIST
 
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=	--enable-esddigi
-PLIST.esound=		yes
-.include "../../audio/esound/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST_SRC+=	PLIST.alsa
+CFLAGS.NetBSD+=	-DESTRPIPE=EPIPE
+CMAKE_ARGS+=	-DWANT_ALSA=1
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWANT_ALSA=0
+.endif
+
+PLIST_SRC+=	PLIST.jack
+.if !empty(PKG_OPTIONS:Mjack)
+CMAKE_ARGS+=	-DWANT_JACK=1
+.include "../../audio/jack/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWANT_JACK=0
 .endif