From owner-svn-ports-head@FreeBSD.ORG Sun Nov 2 18:15:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 306B66D4; Sun, 2 Nov 2014 18:15:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 031CE156; Sun, 2 Nov 2014 18:15:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2IFK0H052124; Sun, 2 Nov 2014 18:15:20 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2IFKhm052122; Sun, 2 Nov 2014 18:15:20 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411021815.sA2IFKhm052122@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 2 Nov 2014 18:15:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372081 - in head/x11-toolkits/irrlicht: . files X-SVN-Group: ports-head 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Nov 2014 18:15:21 -0000 Author: marino Date: Sun Nov 2 18:15:19 2014 New Revision: 372081 URL: https://svnweb.freebsd.org/changeset/ports/372081 QAT: https://qat.redports.org/buildarchive/r372081/ Log: x11-toolkits/irrlicht: Fix DEBUG option, missing linker symbols * apply NDEBUG=1 when DEBUG is off * Depend on libGL instead of libGLU * Add missing -lX11 -lZ to LDFLAGS * Add USE_XORG= x11 xxf86vm PR: 194565 Submitted by: Andriy Voskoboinyk Modified: head/x11-toolkits/irrlicht/Makefile head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile Modified: head/x11-toolkits/irrlicht/Makefile ============================================================================== --- head/x11-toolkits/irrlicht/Makefile Sun Nov 2 17:43:03 2014 (r372080) +++ head/x11-toolkits/irrlicht/Makefile Sun Nov 2 18:15:19 2014 (r372081) @@ -3,6 +3,7 @@ PORTNAME= irrlicht PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/ @@ -17,7 +18,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap DOS2UNIX_GLOB= Makefile *.cpp *.h *.txt USES= alias dos2unix gmake zip -USE_GL= yes +USE_GL= gl +USE_XORG= x11 xxf86vm USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER} @@ -34,7 +36,7 @@ EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map OPTIONS_DEFINE= DEBUG EXAMPLES -DEBUG_MAKE_ENV= NDEBUG=1 +DEBUG_MAKE_ENV_OFF= NDEBUG=1 BROKEN_sparc64= Does not compile Modified: head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile ============================================================================== --- head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile Sun Nov 2 17:43:03 2014 (r372080) +++ head/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile Sun Nov 2 18:15:19 2014 (r372081) @@ -48,7 +48,7 @@ sharedlib install: SHARED_LIB = libIrrlicht.so -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -staticlib sharedlib: CXXINCS += -I/usr/X11R6/include -+sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lpng -ljpeg -lbz2 ++sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lX11 -lpng -ljpeg -lbz2 -lz +staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include #OSX specific options