From igor@doom.homeunix.org  Wed Sep 22 16:56:41 2004
Return-Path: <igor@doom.homeunix.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D066F16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 22 Sep 2004 16:56:41 +0000 (GMT)
Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 707DB43D58
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 22 Sep 2004 16:56:41 +0000 (GMT)
	(envelope-from igor@doom.homeunix.org)
Received: from dialup154-133.ip.peterstar.net ([81.3.154.133] helo=doom.homeunix.org)
	by voodoo.oberon.net with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.42 (FreeBSD))
	id 1CAAPq-000HUq-1v
	for FreeBSD-gnats-submit@freebsd.org; Wed, 22 Sep 2004 18:56:27 +0200
Received: from doom.homeunix.org (localhost [127.0.0.1])
	by doom.homeunix.org (8.13.1/8.13.1) with ESMTP id i8MGuOMr001935
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 22 Sep 2004 20:56:24 +0400 (MSD)
	(envelope-from igor@doom.homeunix.org)
Received: (from igor@localhost)
	by doom.homeunix.org (8.13.1/8.13.1/Submit) id i8MGuNXc001934;
	Wed, 22 Sep 2004 20:56:23 +0400 (MSD)
	(envelope-from igor)
Message-Id: <200409221656.i8MGuNXc001934@doom.homeunix.org>
Date: Wed, 22 Sep 2004 20:56:23 +0400 (MSD)
From: Igor Pokrovsky <ip@doom.homeunix.org>
Reply-To: Igor Pokrovsky <ip@doom.homeunix.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: graphics/deng dependency fix
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72002
>Category:       ports
>Synopsis:       Update port: graphics/deng dependency fix
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 22 17:00:25 GMT 2004
>Closed-Date:    Fri Sep 24 20:12:05 GMT 2004
>Last-Modified:  Fri Sep 24 20:12:05 GMT 2004
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Sun Aug 29 13:51:59 MSD 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
Added missed png dependency.
Marked broken on amd64.
	
>How-To-Repeat:
	
>Fix:

	

--- deng.diff begins here ---
diff -ru /usr/ports/games/deng/Makefile deng/Makefile
--- /usr/ports/games/deng/Makefile	Wed Sep 22 20:34:02 2004
+++ deng/Makefile	Wed Sep 22 20:49:30 2004
@@ -14,10 +14,9 @@
 MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	An enhanced Doom, Heretic and Hexen source port
 
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity
 
-BROKEN=		Missing dependency
-
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 GNU_CONFIGURE=	yes
@@ -27,6 +26,7 @@
 USE_SDL=	sdl mixer net
 USE_GL=		yes
 INSTALLS_SHLIB=	yes
+NOT_FOR_ARCHS=	amd64
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
--- deng.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: thierry 
State-Changed-When: Thu Sep 23 19:10:58 GMT 2004 
State-Changed-Why:  

- this port uses LIBTOOL; 

- <bsd.port.pre.mk> is no more required; 

- fix WITH_OPENAL case. 

I propose you the following patch: 

--- deng.diff begins here --- 
diff -urN games/deng.orig/Makefile games/deng/Makefile 
--- games/deng.orig/Makefile	Thu Sep 23 20:27:13 2004 
+++ games/deng/Makefile	Thu Sep 23 21:03:43 2004 
@@ -14,28 +14,25 @@ 
MAINTAINER=	ip@doom.homeunix.org 
COMMENT=	An enhanced Doom, Heretic and Hexen source port 

+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png 
RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity 

-BROKEN=		Missing dependency 
- 
USE_REINPLACE=	yes 
REINPLACE_ARGS=	-i "" 
-GNU_CONFIGURE=	yes 
+USE_LIBTOOL_VER=	15 
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} 
CONFIGURE_ENV=	CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include"  
CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" 
USE_SDL=	sdl mixer net 
USE_GL=		yes 
INSTALLS_SHLIB=	yes 
+NOT_FOR_ARCHS=	amd64 

PKGMESSAGE=	${WRKDIR}/pkg-message 

-.include <bsd.port.pre.mk> 
- 
-.if exists(${LOCALBASE}/lib/libopenal.so.0) 
+.if exists(${LOCALBASE}/lib/libopenal.so.0) || defined(WITH_OPENAL) 
WITH_OPENAL=	yes 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libopenal.so.0:${PORTSDIR}/audio/openal 
-RUN_DEPENDS=	${LOCALBASE}/lib/libopenal.so.0:${PORTSDIR}/audio/openal 
+LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal 
.endif 

.if !defined(WITH_OPENAL) 
@@ -69,4 +66,4 @@ 
@(${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%DOCSDIR%%|${DOCSDIR}|'  
<pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE}) 

-.include <bsd.port.post.mk> 
+.include <bsd.port.mk> 
diff -urN games/deng.orig/pkg-plist games/deng/pkg-plist 
--- games/deng.orig/pkg-plist	Thu Sep 23 20:27:13 2004 
+++ games/deng/pkg-plist	Thu Sep 23 20:59:22 2004 
@@ -1,34 +1,20 @@ 
bin/doomsday 
lib/libdpdehread.a 
-lib/libdpdehread.la 
lib/libdpdehread.so 
lib/libdpdehread.so.0 
lib/libdpmapload.a 
-lib/libdpmapload.la 
lib/libdpmapload.so 
lib/libdpmapload.so.0 
-lib/libdropengl.a 
-lib/libdropengl.la 
lib/libdropengl.so 
lib/libdropengl.so.0 
-%%WITH_OPENAL%%lib/libdsopenal.a 
-%%WITH_OPENAL%%lib/libdsopenal.la 
%%WITH_OPENAL%%lib/libdsopenal.so 
%%WITH_OPENAL%%lib/libdsopenal.so.0 
-lib/libdssdlmixer.a 
-lib/libdssdlmixer.la 
lib/libdssdlmixer.so 
lib/libdssdlmixer.so.0 
-lib/libjdoom.a 
-lib/libjdoom.la 
lib/libjdoom.so 
lib/libjdoom.so.0 
-lib/libjheretic.a 
-lib/libjheretic.la 
lib/libjheretic.so 
lib/libjheretic.so.0 
-lib/libjhexen.a 
-lib/libjhexen.la 
lib/libjhexen.so 
lib/libjhexen.so.0 
%%DATADIR%%/Data/Doomsday.wad 
--- deng.diff ends here --- 



Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Thu Sep 23 19:10:58 GMT 2004 
Responsible-Changed-Why:  

Take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=72002 
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Fri Sep 24 20:11:28 GMT 2004 
State-Changed-Why:  

Committed, thanks. 


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