Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 86BAF1A9239 for ; Mon, 31 Jan 2022 10:39:26 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3893884D55; Mon, 31 Jan 2022 10:39:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 70A0384CEF for ; Mon, 31 Jan 2022 10:39:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id iMLq8JBzpe1q for ; Mon, 31 Jan 2022 10:39:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DFAC084CDC for ; Mon, 31 Jan 2022 10:39:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D2A22FB24; Mon, 31 Jan 2022 10:39:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1643625564278360" MIME-Version: 1.0 Date: Mon, 31 Jan 2022 10:39:24 +0000 From: "Michael Baeuerle" Subject: CVS commit: pkgsrc/editors/xnedit To: pkgsrc-changes@NetBSD.org Reply-To: micha@netbsd.org X-Mailer: log_accum Message-Id: <20220131103924.D2A22FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1643625564278360 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: micha Date: Mon Jan 31 10:39:24 UTC 2022 Modified Files: pkgsrc/editors/xnedit: Makefile Log Message: editors/xnedit: Build fixes - Honor external CFLAGS (should now use pkgsrc hardening flags) - Use POSIX struct dirent (should fix build on SmartOS) - Enable workarounds for Motif bugs on IRIX and Solaris Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/xnedit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1643625564278360 Content-Disposition: inline Content-Length: 1338 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/xnedit/Makefile diff -u pkgsrc/editors/xnedit/Makefile:1.1 pkgsrc/editors/xnedit/Makefile:1.2 --- pkgsrc/editors/xnedit/Makefile:1.1 Fri Jan 28 11:50:12 2022 +++ pkgsrc/editors/xnedit/Makefile Mon Jan 31 10:39:24 2022 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2022/01/28 11:50:12 micha Exp $ +# $NetBSD: Makefile,v 1.2 2022/01/31 10:39:24 micha Exp $ VERS= 1.4.0 DISTNAME= xnedit-${VERS} +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xnedit/} @@ -17,6 +18,20 @@ WRKSRC= ${WRKDIR}/xnedit BUILD_TARGET= generic INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PREFIX}/share/doc/xnedit +# Use POSIX struct dirent (instead of BSD struct direct) +CFLAGS+= -DUSE_DIRENT +# Workaround for bugs in IRIX Motif library +CFLAGS.IRIX+= -DNO_XMIM +# Workaround for bugs in Solaris Motif library +CFLAGS.SunOS+= -DROWCOLPATCH + +# Honor external CFLAGS +SUBST_CLASSES+= fix-cflags +SUBST_STAGE.fix-cflags= pre-configure +SUBST_MESSAGE.fix-cflags= Fixing Makefile.generic. +SUBST_FILES.fix-cflags= makefiles/Makefile.generic +SUBST_SED.fix-cflags= -e 's,CFLAGS=,CFLAGS+=,' + # Search for Xft headers in X11 subdirectory # Upstream ticket: # Fixed with commit 452499daab227afab372763f7a64ec996c7057db, remove this patch --_----------=_1643625564278360--