CVS commit: pkgsrc/editors/xnedit

["Michael Baeuerle" <micha%netbsd.org@localhost>]

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.

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: <https://sourceforge.net/p/xnedit/bugs/20/>
 # Fixed with commit 452499daab227afab372763f7a64ec996c7057db, remove this patch