From nobody@FreeBSD.org  Tue Jul  2 16:39:14 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id E6ED4AE0
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  2 Jul 2013 16:39:14 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id D975218F0
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  2 Jul 2013 16:39:14 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r62GdExu015894
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 2 Jul 2013 16:39:14 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r62GdEX8015893;
	Tue, 2 Jul 2013 16:39:14 GMT
	(envelope-from nobody)
Message-Id: <201307021639.r62GdEX8015893@oldred.freebsd.org>
Date: Tue, 2 Jul 2013 16:39:14 GMT
From: nemysis <nemysis@gmx.ch>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] audio/dumb: Add ALLEGRO_DEVEL, trim ALLEGRO Option
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180207
>Category:       ports
>Synopsis:       [PATCH] audio/dumb: Add ALLEGRO_DEVEL, trim ALLEGRO Option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 02 16:40:00 UTC 2013
>Closed-Date:    Mon Jan 20 22:38:28 UTC 2014
>Last-Modified:  Mon Jan 20 22:38:28 UTC 2014
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:
- Add ALLEGRO_DEVEL Option
- Trim ALLEGRO Option
- Add audio/dumb-allegro-devel as a slave port for audio/dumb
>How-To-Repeat:
Build log

https://redports.org/buildarchive/20130702160900-10599/
>Fix:
Shar is also on

https://github.com/nemysis/FreeBSD_Ports/blob/master/patch/audio/dumb.diff

Patch attached with submission follows:

diff -ruN /usr/ports/audio/dumb/Makefile ./Makefile
--- /usr/ports/audio/dumb/Makefile	2013-06-15 21:02:29.000000000 +0200
+++ ./Makefile	2013-07-02 17:56:03.000000000 +0200
@@ -12,12 +12,13 @@
 
 USE_GMAKE=	yes
 
-OPTIONS_DEFINE=	ALLEGRO
+OPTIONS_DEFINE=	ALLEGRO ALLEGRO_DEVEL
 ALLEGRO_DESC=	Enable allegro support
+ALLEGRO_DEVEL_DESC=	Enable allegro development version
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MALLEGRO}
+.if ${PORT_OPTIONS:MALLEGRO} && ! ${PORT_OPTIONS:MALLEGRO_DEVEL}
 LIB_DEPENDS+=	alleg.42:${PORTSDIR}/devel/allegro
 PLIST_SUB+=	ALLEGRO=""
 MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
@@ -29,6 +30,18 @@
 CONFLICTS=	dumb-allegro-[0-9]*
 .endif
 
+.if ${PORT_OPTIONS:MALLEGRO} && ${PORT_OPTIONS:MALLEGRO_DEVEL}
+LIB_DEPENDS+=	alleg.4:${PORTSDIR}/devel/allegro-devel
+PLIST_SUB+=	ALLEGRO=""
+MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
+PKGNAMESUFFIX=	-allegro-devel
+CONFLICTS=	dumb-[0-9]*
+.else
+PLIST_SUB+=	ALLEGRO="@comment "
+MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
+CONFLICTS=	dumb-allegro-devel[0-9]*
+.endif
+
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 .endif


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jul 2 16:40:14 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180207 

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc: miwi@FreeBSD.org, wxs@FreeBSD.org, wg@FreeBSD.org, pawel@FreeBSD.org,
 amdmi3@FreeBSD.org
Subject: Re: ports/180207: [PATCH] audio/dumb: Add ALLEGRO_DEVEL, trim
 ALLEGRO Option
Date: Mon, 12 Aug 2013 01:25:57 +0200

 --MP_/cRqARG8286z6U85hWY9iWK7
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 - Bump portrevision
 - USES gmake
 - Add RADIO, ALLEGRO and ALLEGRO_DEVEL Option
 - Add ALLEGRO_DEVEL to default Options
 - Remove pre-configure add post-patch
 - Add audio/dumb-allegro-devel as a slave port for audio/dumb
 - Trim pkg-plist
 
 
 This patch and audio/dumb-allegro-devel (ports/180206) is needed for upcoming Port games/opensurge
 --MP_/cRqARG8286z6U85hWY9iWK7
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=dumb.diff
 
 diff -ruN /usr/ports/audio/dumb/Makefile ./dumb/Makefile
 --- /usr/ports/audio/dumb/Makefile	2013-07-13 22:41:06.000000000 +0200
 +++ ./dumb/Makefile	2013-08-12 01:11:09.000000000 +0200
 @@ -3,43 +3,64 @@
  
  PORTNAME=	dumb
  PORTVERSION=	0.9.3
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	audio
  MASTER_SITES=	SF
  
  MAINTAINER=	amdmi3@FreeBSD.org
  COMMENT=	IT, XM, S3M, and MOD player library
  
 -USE_GMAKE=	yes
 +USES=	gmake
 +
 +OPTIONS_RADIO=	ALLEGRO
 +OPTIONS_RADIO_ALLEGRO=	ALLEGRO ALLEGRO_DEVEL
 +
 +OPTIONS_DEFAULT=	ALLEGRO_DEVEL
 +
 +OPTIONS_SUB=	yes
  
 -OPTIONS_DEFINE=	ALLEGRO
  ALLEGRO_DESC=	Enable allegro support
 +ALLEGRO_DEVEL_DESC=	Enable allegro development version
 +
 +ALLEGRO_LIB_DEPENDS=		alleg:${PORTSDIR}/devel/allegro
 +ALLEGRO_DEVEL_LIB_DEPENDS=	liballegro.so:${PORTSDIR}/devel/allegro-devel
  
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MALLEGRO}
 -LIB_DEPENDS+=	alleg:${PORTSDIR}/devel/allegro
 -PLIST_SUB+=	ALLEGRO=""
 -MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
 +SET_ALLEGRO=	yes
  PKGNAMESUFFIX=	-allegro
  CONFLICTS=	dumb-[0-9]*
  .else
 -PLIST_SUB+=	ALLEGRO="@comment "
 -MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
  CONFLICTS=	dumb-allegro-[0-9]*
  .endif
  
 +.if ${PORT_OPTIONS:MALLEGRO_DEVEL}
 +SET_ALLEGRO=	yes
 +PKGNAMESUFFIX=	-allegro-devel
 +CONFLICTS=	dumb-[0-9]*
 +.else
 +CONFLICTS=	dumb-allegro-devel-[0-9]*
 +.endif
 +
 +.if defined(SET_ALLEGRO)
 +MAKE_ARGS+=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
 +.else
 +MAKE_ARGS+=	_PORT_ALLEGRO_CFLAGS=
 +.endif
 +
  .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
  CFLAGS+=	-fPIC
  .endif
  
 -pre-configure:
 -	@${CP} ${FILESDIR}/config.txt ${WRKSRC}/make
 -	@${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE}," ${WRKSRC}/make/config.txt
 -.if ${PORT_OPTIONS:MALLEGRO}
 -	@${REINPLACE_CMD} -e "s,@ALLEGRO@,," ${WRKSRC}/make/config.txt
 +post-patch:
 +	${CP} ${FILESDIR}/config.txt ${WRKSRC}/make
 +	${REINPLACE_CMD} -e 's|@LOCALBASE@|${PREFIX}|' ${WRKSRC}/make/config.txt
 +
 +.if defined(SET_ALLEGRO)
 +	${REINPLACE_CMD} -e 's|@ALLEGRO@ ||' ${WRKSRC}/make/config.txt
  .else
 -	@${REINPLACE_CMD} -e "s,@ALLEGRO@,#," ${WRKSRC}/make/config.txt
 +	${REINPLACE_CMD} -e 's|@ALLEGRO@ |#|' ${WRKSRC}/make/config.txt
  .endif
  
  .include <bsd.port.mk>
 diff -ruN /usr/ports/audio/dumb/pkg-plist ./dumb/pkg-plist
 --- /usr/ports/audio/dumb/pkg-plist	2013-06-02 19:00:39.000000000 +0200
 +++ ./dumb/pkg-plist	2013-08-11 17:02:23.000000000 +0200
 @@ -1,7 +1,10 @@
  %%ALLEGRO%%bin/dumbplay
 +%%ALLEGRO_DEVEL%%bin/dumbplay
  bin/dumbout
  bin/dumb2wav
  include/dumb.h
  %%ALLEGRO%%include/aldumb.h
 +%%ALLEGRO_DEVEL%%include/aldumb.h
  lib/libdumb.a
  %%ALLEGRO%%lib/libaldmb.a
 +%%ALLEGRO_DEVEL%%lib/libaldmb.a
 
 --MP_/cRqARG8286z6U85hWY9iWK7--

From: Rusmir =?utf-8?B?RHXFoWtv?= <nemysis@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc: nemysis@FreeBSD.org
Subject: ports/180207: [PATCH] audio/dumb: Add ALLEGRO_DEVEL, trim ALLEGRO
 Option
Date: Sat, 28 Sep 2013 21:38:15 +0200

 --4Ckj6UjgE2iN1+kY
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 - Bump PORTREVISION
 - Add ALLEGRO_DEVEL Option
 - Change ALLEGRO Option
 - Add ALLEGRO to default Options
 - Add audio/dumb-allegro-devel as a slave port for audio/dumb
 - Add OPTIONS_SUB
 - Remove pre-configure, add post-patch and change REINPLACE_CMD
 - Change pkg-plist
 
 --4Ckj6UjgE2iN1+kY
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="dumb.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 328620)
 +++ Makefile	(working copy)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	dumb
  PORTVERSION=	0.9.3
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	audio
  MASTER_SITES=	SF
  
 @@ -13,35 +13,55 @@
  USES=		gmake
  NO_STAGE=	yes
  
 -OPTIONS_DEFINE=	ALLEGRO
 +OPTIONS_RADIO=	ALLEGRO
 +OPTIONS_RADIO_ALLEGRO=	ALLEGRO ALLEGRO_DEVEL
 +
 +OPTIONS_DEFAULT=	ALLEGRO
 +
 +OPTIONS_SUB=	yes
 +
  ALLEGRO_DESC=	Enable allegro support
 +ALLEGRO_DEVEL_DESC=	Enable allegro development version
  
 +ALLEGRO_LIB_DEPENDS=		liballeg.so:${PORTSDIR}/devel/allegro
 +ALLEGRO_DEVEL_LIB_DEPENDS=	liballegro.so:${PORTSDIR}/devel/allegro-devel
 +
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MALLEGRO}
 -LIB_DEPENDS+=	alleg:${PORTSDIR}/devel/allegro
 -PLIST_SUB+=	ALLEGRO=""
 -MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
 -MAKE_ARGS+=	LINK_ALLEGRO="-lm -L${LOCALBASE}/lib -lalleg"
 +SET_ALLEGRO=	yes
  PKGNAMESUFFIX=	-allegro
  CONFLICTS=	dumb-[0-9]*
  .else
 -PLIST_SUB+=	ALLEGRO="@comment "
 -MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
  CONFLICTS=	dumb-allegro-[0-9]*
  .endif
  
 +.if ${PORT_OPTIONS:MALLEGRO_DEVEL}
 +SET_ALLEGRO=	yes
 +PKGNAMESUFFIX=	-allegro-devel
 +CONFLICTS=	dumb-[0-9]*
 +.else
 +CONFLICTS=	dumb-allegro-devel-[0-9]*
 +.endif
 +
 +.if defined(SET_ALLEGRO)
 +MAKE_ARGS+=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
 +.else
 +MAKE_ARGS+=	_PORT_ALLEGRO_CFLAGS=
 +.endif
 +
  .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
  CFLAGS+=	-fPIC
  .endif
  
 -pre-configure:
 -	@${CP} ${FILESDIR}/config.txt ${WRKSRC}/make
 -	@${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE}," ${WRKSRC}/make/config.txt
 -.if ${PORT_OPTIONS:MALLEGRO}
 -	@${REINPLACE_CMD} -e "s,@ALLEGRO@,," ${WRKSRC}/make/config.txt
 +post-patch:
 +	${CP} ${FILESDIR}/config.txt ${WRKSRC}/make
 +	${REINPLACE_CMD} -e 's|@LOCALBASE@|${PREFIX}|' ${WRKSRC}/make/config.txt
 +
 +.if defined(SET_ALLEGRO)
 +	${REINPLACE_CMD} -e 's|@ALLEGRO@ ||' ${WRKSRC}/make/config.txt
  .else
 -	@${REINPLACE_CMD} -e "s,@ALLEGRO@,#," ${WRKSRC}/make/config.txt
 +	${REINPLACE_CMD} -e 's|@ALLEGRO@ |#|' ${WRKSRC}/make/config.txt
  .endif
  
  .include <bsd.port.mk>
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 328620)
 +++ pkg-plist	(working copy)
 @@ -1,7 +1,10 @@
  %%ALLEGRO%%bin/dumbplay
 +%%ALLEGRO_DEVEL%%bin/dumbplay
  bin/dumbout
  bin/dumb2wav
  include/dumb.h
  %%ALLEGRO%%include/aldumb.h
 +%%ALLEGRO_DEVEL%%include/aldumb.h
  lib/libdumb.a
  %%ALLEGRO%%lib/libaldmb.a
 +%%ALLEGRO_DEVEL%%lib/libaldmb.a
 
 --4Ckj6UjgE2iN1+kY--
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Mon Jan 20 22:38:27 UTC 2014 
State-Changed-Why:  
dumb doesn't build with allegro5 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180207 
>Unformatted:
