Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Oct 2016 06:44:22 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r424308 - branches/2016Q4/x11-toolkits/girara
Message-ID:  <201610200644.u9K6iMih062637@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Thu Oct 20 06:44:21 2016
New Revision: 424308
URL: https://svnweb.freebsd.org/changeset/ports/424308

Log:
  MFH: r424292
  
  - Add GCC option, turned on by default, to force compilation using
    GCC, this fixes a problem in zathura which shows up only when girara
    is compiled wth clang [1]
  - Make the port use gnu99 C standard to allow it to compile with
    the default gcc 4.8
  - Remove USES=compiler since it's not needed anymore
  - Small cosmetic change to the REINPLACE_CMD lines
  - While here, make the build verbose
  
  PR:		213595
  Submitted by:	Michael Danilov <mike.d.ft402@gmail.com>
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q4/x11-toolkits/girara/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/x11-toolkits/girara/Makefile
==============================================================================
--- branches/2016Q4/x11-toolkits/girara/Makefile	Thu Oct 20 06:13:07 2016	(r424307)
+++ branches/2016Q4/x11-toolkits/girara/Makefile	Thu Oct 20 06:44:21 2016	(r424308)
@@ -3,6 +3,7 @@
 
 PORTNAME=	girara
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	http://pwmt.org/projects/girara/download/
 
@@ -10,22 +11,30 @@ MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	GTK3 Interface Library for Zathura PDF Viewer
 
 USE_GNOME=	glib20 gtk30
-USES=		compiler:c11 gmake pkgconfig
+USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
+USE_CSTD=	gnu99
 LIBDIR=		${PREFIX}/lib
-MAKE_ENV+=	SFLAGS=${STRIP}
+MAKE_ENV+=	SFLAGS=${STRIP} \
+		VERBOSE=1
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	GCC NLS
+# Force GCC by default due to problems in dependent port zathura with keyboard
+# input when compiled using clang.
+OPTIONS_DEFAULT=GCC
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
+GCC_USE=	GCC=yes
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
+	${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|^\(CFLAGS +=\) -std=c11|\1|' \
+		${WRKSRC}/config.mk
 
 post-patch-NLS-off: .SILENT
-	${REINPLACE_CMD} -e '/-C po/d'\
+	${REINPLACE_CMD} -e '/-C po/d' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610200644.u9K6iMih062637>