From owner-svn-ports-head@freebsd.org  Sun Dec 31 12:42:20 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C6DCEB41F9;
 Sun, 31 Dec 2017 12:42:20 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3596471BDA;
 Sun, 31 Dec 2017 12:42:20 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBVCgJJ1030574;
 Sun, 31 Dec 2017 12:42:19 GMT (envelope-from zeising@FreeBSD.org)
Received: (from zeising@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBVCgJxl030573;
 Sun, 31 Dec 2017 12:42:19 GMT (envelope-from zeising@FreeBSD.org)
Message-Id: <201712311242.vBVCgJxl030573@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zeising set sender to
 zeising@FreeBSD.org using -f
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Sun, 31 Dec 2017 12:42:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r457685 - head/graphics/imlib2
X-SVN-Group: ports-head
X-SVN-Commit-Author: zeising
X-SVN-Commit-Paths: head/graphics/imlib2
X-SVN-Commit-Revision: 457685
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Dec 2017 12:42:20 -0000

Author: zeising
Date: Sun Dec 31 12:42:19 2017
New Revision: 457685
URL: https://svnweb.freebsd.org/changeset/ports/457685

Log:
  Properly fix when X11 option is off.
  
  When the X11 option is off, there are still things in the Imlib2.h header
  that uses X11, fix this by removing those bits when building without X11.
  
  PR:		224354
  Submitted by:	Dominik Honnef

Modified:
  head/graphics/imlib2/Makefile

Modified: head/graphics/imlib2/Makefile
==============================================================================
--- head/graphics/imlib2/Makefile	Sun Dec 31 12:07:28 2017	(r457684)
+++ head/graphics/imlib2/Makefile	Sun Dec 31 12:42:19 2017	(r457685)
@@ -3,6 +3,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	1.4.10
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
@@ -63,10 +64,10 @@ CONFIGURE_ARGS+=	--enable-amd64
 CONFIGURE_ARGS+=	--disable-amd64
 .endif
 
-post-patch-X11-on:
+post-patch-X11-off:
 	@${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \
 		${WRKSRC}/src/lib/Makefile.in
-	@${REINPLACE_CMD} -e '/# ifndef X_DISPLAY_MISSING/,/# endif/ d' \
+	@${REINPLACE_CMD} -e '/#ifndef X_DISPLAY_MISSING/,/#endif/ d' \
 		${WRKSRC}/src/lib/Imlib2.h
 
 .include <bsd.port.mk>