From helmut@charlieroot.de  Fri Oct  5 20:27:32 2012
Return-Path: <helmut@charlieroot.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 047A91065670
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Oct 2012 20:27:32 +0000 (UTC)
	(envelope-from helmut@charlieroot.de)
Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81])
	by mx1.freebsd.org (Postfix) with ESMTP id B2A4F8FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Oct 2012 20:27:31 +0000 (UTC)
Received: from fwd07.aul.t-online.de (fwd07.aul.t-online.de )
	by mailout03.t-online.de with smtp 
	id 1TKEFh-0006gI-8w; Fri, 05 Oct 2012 22:12:05 +0200
Received: from mailout.charlieroot.de (TWIsmuZT8he4Pxcgt1vxRaaTe3KrC6Ixsjj-XQz3DDG5aaRIlqrOtqZTeIwiofxQI1@[93.205.113.44]) by fwd07.aul.t-online.de
	with esmtp id 1TKEFX-06xRjc0; Fri, 5 Oct 2012 22:11:55 +0200
Received: from BSDHelmut964.charlieroot.de (bsdhelmut964.charlieroot.de [192.168.124.202])
	by mailout.charlieroot.de (Postfix) with ESMTP id 6DA9617047
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Oct 2012 22:11:55 +0200 (CEST)
Received: by BSDHelmut964.charlieroot.de (Postfix, from userid 1001)
	id 25E1818337; Fri,  5 Oct 2012 22:11:55 +0200 (CEST)
Message-Id: <20121005201155.25E1818337@BSDHelmut964.charlieroot.de>
Date: Fri,  5 Oct 2012 22:11:55 +0200 (CEST)
From: Helmut Schneider <jumper99@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] www/typo3: Fix WITHOUT_X11
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         172373
>Category:       ports
>Synopsis:       [MAINTAINER] www/typo3: Fix WITHOUT_X11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 05 20:30:15 UTC 2012
>Closed-Date:    Sat Oct 06 02:54:27 UTC 2012
>Last-Modified:  Sat Oct  6 03:00:23 UTC 2012
>Originator:     Helmut Schneider
>Release:        FreeBSD 9.0-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD BSDHelmut964.charlieroot.de 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #3: Tue Aug  7 20:55:23 CEST
>Description:
- Fix WITHOUT_X11

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- typo3-4.7.4.patch begins here ---
diff -ruN --exclude=CVS ../typo3.org/Makefile ./Makefile
--- ../typo3.org/Makefile	2012-09-21 21:46:14.000000000 +0200
+++ ./Makefile	2012-10-05 21:58:17.000000000 +0200
@@ -47,8 +47,12 @@
 .endif
 
 .if ${PORT_OPTIONS:MIMAGICK}
+.if defined(WITHOUT_X11)
+RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
+.else
 RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 .endif
+.endif
 
 .if ${PORT_OPTIONS:MMBSTRING}
 USE_PHP+=	mbstring
--- typo3-4.7.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Fri Oct 5 22:52:55 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172373 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Sat Oct 6 02:54:23 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/172373: commit references a PR
Date: Sat,  6 Oct 2012 02:51:45 +0000 (UTC)

 Author: jgh
 Date: Sat Oct  6 02:51:31 2012
 New Revision: 305330
 URL: http://svn.freebsd.org/changeset/ports/305330
 
 Log:
   - fix option WITHOUT_X11
   
   PR:		172373
   Submitted by:	maintainer, jumper99@gmx.de
 
 Modified:
   head/www/typo3/Makefile
 
 Modified: head/www/typo3/Makefile
 ==============================================================================
 --- head/www/typo3/Makefile	Sat Oct  6 02:48:43 2012	(r305329)
 +++ head/www/typo3/Makefile	Sat Oct  6 02:51:31 2012	(r305330)
 @@ -1,9 +1,6 @@
 -# New ports collection makefile for:	www/typo3
 -# Date created:				February 6th 2005
 -# Whom:	      				Gerrit Beine <tux@pinguru.net>
 +# Created by:		Gerrit Beine <tux@pinguru.net>
  #
  # $FreeBSD$
 -#
  
  PORTNAME=	typo3
  PORTVERSION=	4.7.4
 @@ -47,7 +44,11 @@ USE_PHP+=	gd
  .endif
  
  .if ${PORT_OPTIONS:MIMAGICK}
 +.if ${PORT_OPTIONS:MX11}
  RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 +.else
 +RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
 +.endif
  .endif
  
  .if ${PORT_OPTIONS:MMBSTRING}
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
