2 files changed, 27 insertions, 3 deletions

diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 1ddff5c955e8..ede825289a49 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -16,13 +16,16 @@ COMMENT=	A cross-platform library for games and multimedia programming
 
 USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_XLIB=	yes
 WANT_GNOME=	yes
 
-OPTIONS=	ARTS "Enable Arts support" off \
+OPTIONS=	AL "Enable OpenAL support" off \
+		ARTS "Enable Arts support" off \
 		DEBUG "Build debugging library" off \
 		DEVEL "Build development utilities" on \
 		ESOUND "Enable Esound support" off \
+		JACK "Enable JACK support" off \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
 		PROFILE "Build profiling library" off \
 		THREADS "Enable threads" on
@@ -34,9 +37,10 @@ ALL_TARGET=	full-build
 
 INFO=		allegro
 
-INSTALLS_SHLIB=	yes
-SHLIB_VER=	42
+CONFLICTS=	allegro-devel-[0-9]*
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
+
+SHLIB_VER=	42
 DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 
 .include <bsd.port.pre.mk>
@@ -45,6 +49,15 @@ DEMO=		demo.c demo.dat demo.h music.txt ../readme.txt
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-include-allegro-inline-fmaths.in
 .endif
 
+.if defined(WITH_AL)
+LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
+CONFIGURE_ARGS+=--enable-sgialdigi
+PLIST_SUB+=	AL=""
+.else
+CONFIGURE_ARGS+=--disable-sgialdigi
+PLIST_SUB+=	AL="@comment "
+.endif
+
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=--enable-artsdigi
@@ -79,6 +92,15 @@ CONFIGURE_ARGS+=--disable-esddigi
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=--enable-jackdigi
+PLIST_SUB+=	JACK=""
+.else
+CONFIGURE_ARGS+=--disable-jackdigi
+PLIST_SUB+=	JACK="@comment "
+.endif
+
 .if defined(WITH_PROFILE)
 CONFIGURE_ARGS+=--enable-proflib
 PLIST_SUB+=	PROFILE=""
diff --git a/devel/allegro-devel/pkg-plist b/devel/allegro-devel/pkg-plist
index 79155906def8..683321abbc22 100644
--- a/devel/allegro-devel/pkg-plist
+++ b/devel/allegro-devel/pkg-plist
@@ -98,6 +98,8 @@ include/xalleg.h
 %%ARTS%%lib/allegro/%%SHLIB_VER%%/alleg-artsdigi.so
 lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
 %%ESOUND%%lib/allegro/%%SHLIB_VER%%/alleg-esddigi.so
+%%JACK%%lib/allegro/%%SHLIB_VER%%/alleg-jackdigi.so
+%%AL%%lib/allegro/%%SHLIB_VER%%/alleg-sgialdigi.so
 lib/allegro/%%SHLIB_VER%%/modules.lst
 %%DEBUG%%lib/liballd.so
 %%DEBUG%%lib/liballd.so.%%SHLIB_VER%%