pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/xnedit editors/xnedit: Build fixes



details:   https://anonhg.NetBSD.org/pkgsrc/rev/49b21bbe9051
branches:  trunk
changeset: 372796:49b21bbe9051
user:      micha <micha%pkgsrc.org@localhost>
date:      Mon Jan 31 10:39:24 2022 +0000

description:
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.

diffstat:

 editors/xnedit/Makefile |  17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 6f0103c70b63 -r 49b21bbe9051 editors/xnedit/Makefile
--- a/editors/xnedit/Makefile   Mon Jan 31 10:00:33 2022 +0000
+++ b/editors/xnedit/Makefile   Mon Jan 31 10:39:24 2022 +0000
@@ -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 @@
 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: <https://sourceforge.net/p/xnedit/bugs/20/>
 # Fixed with commit 452499daab227afab372763f7a64ec996c7057db, remove this patch



Home | Main Index | Thread Index | Old Index