CVS commit: pkgsrc/editors/xnedit

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors/xnedit
From: "Michael Baeuerle" <micha%netbsd.org@localhost>
Date: Fri, 28 Jan 2022 11:50:12 +0000

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jan 28 11:50:12 UTC 2022

Added Files:
        pkgsrc/editors/xnedit: DESCR Makefile PLIST distinfo
        pkgsrc/editors/xnedit/patches: patch-source_Makefile.common
            patch-source_textSel.c

Log Message:
editors/xnedit: Import 1.4.0

A fast and classic X11 text editor, based on NEdit, with full unicode
support and antialiased text rendering.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/xnedit/DESCR \
    pkgsrc/editors/xnedit/Makefile pkgsrc/editors/xnedit/PLIST \
    pkgsrc/editors/xnedit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/xnedit/patches/patch-source_Makefile.common \
    pkgsrc/editors/xnedit/patches/patch-source_textSel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/editors/xnedit/DESCR
diff -u /dev/null pkgsrc/editors/xnedit/DESCR:1.1
--- /dev/null   Fri Jan 28 11:50:12 2022
+++ pkgsrc/editors/xnedit/DESCR Fri Jan 28 11:50:12 2022
@@ -0,0 +1,10 @@
+XNEdit is a multi-purpose text editor for the X Window System, which
+combines a standard, easy to use, graphical user interface with the
+thorough functionality and stability required by users who edit text
+eight hours a day. It provides intensive support for development in
+a wide variety of languages, text processors, and other tools, but at
+the same time can be used productively by just about anyone who needs
+to edit text.
+
+XNEdit is a fork of the Nirvana Editor (NEdit) and provides new
+functionality like antialiased text rendering and support for unicode.
Index: pkgsrc/editors/xnedit/Makefile
diff -u /dev/null pkgsrc/editors/xnedit/Makefile:1.1
--- /dev/null   Fri Jan 28 11:50:12 2022
+++ pkgsrc/editors/xnedit/Makefile      Fri Jan 28 11:50:12 2022
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile,v 1.1 2022/01/28 11:50:12 micha Exp $
+
+VERS=          1.4.0
+DISTNAME=      xnedit-${VERS}
+CATEGORIES=    editors
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xnedit/}
+
+MAINTAINER=    micha%NetBSD.org@localhost
+HOMEPAGE=      https://sourceforge.net/projects/xnedit/
+COMMENT=       Fork of NEdit with Unicode support and antialiased text
+LICENSE=       gnu-gpl-v2
+
+USE_LANGUAGES= c99
+USE_TOOLS=     pkg-config yacc
+
+WRKSRC=                        ${WRKDIR}/xnedit
+BUILD_TARGET=          generic
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PREFIX}/share/doc/xnedit
+
+# Search for Xft headers in X11 subdirectory
+# Upstream ticket: <https://sourceforge.net/p/xnedit/bugs/20/>
+# Fixed with commit 452499daab227afab372763f7a64ec996c7057db, remove this patch
+# for next release.
+SUBST_CLASSES+=                        fix-include
+SUBST_STAGE.fix-include=       pre-configure
+SUBST_MESSAGE.fix-include=     Fixing include Xft.h.
+SUBST_FILES.fix-include=       source/nedit.h
+SUBST_FILES.fix-include+=      source/rangeset.h
+SUBST_FILES.fix-include+=      source/text.h
+SUBST_FILES.fix-include+=      source/textDisp.h
+SUBST_FILES.fix-include+=      source/textP.h
+SUBST_FILES.fix-include+=      util/colorchooser.c
+SUBST_FILES.fix-include+=      util/fontsel.c
+SUBST_SED.fix-include=         -e 's,Xft/Xft.h>,X11/&,'
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/source/xnedit ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/source/xnc ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/doc/xnedit.man \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xnedit.1
+       ${INSTALL_MAN} ${WRKSRC}/doc/xnc.man \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xnc.1
+.for f in README.md ReleaseNotes
+        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/xnedit
+.endfor
+.for f in NEdit.ad faq.txt xnedit.txt
+       ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/doc/xnedit
+.endfor
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/xnedit/PLIST
diff -u /dev/null pkgsrc/editors/xnedit/PLIST:1.1
--- /dev/null   Fri Jan 28 11:50:12 2022
+++ pkgsrc/editors/xnedit/PLIST Fri Jan 28 11:50:12 2022
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2022/01/28 11:50:12 micha Exp $
+bin/xnc
+bin/xnedit
+man/man1/xnc.1
+man/man1/xnedit.1
+share/doc/xnedit/NEdit.ad
+share/doc/xnedit/README.md
+share/doc/xnedit/ReleaseNotes
+share/doc/xnedit/faq.txt
+share/doc/xnedit/xnedit.txt
Index: pkgsrc/editors/xnedit/distinfo
diff -u /dev/null pkgsrc/editors/xnedit/distinfo:1.1
--- /dev/null   Fri Jan 28 11:50:12 2022
+++ pkgsrc/editors/xnedit/distinfo      Fri Jan 28 11:50:12 2022
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2022/01/28 11:50:12 micha Exp $
+
+BLAKE2s (xnedit-1.4.0.tar.gz) = 6d36770d496e3e7fed8c907bf86073e0bba5e77f264565d2d8740d1096982fee
+SHA512 (xnedit-1.4.0.tar.gz) = eba465679984290b5ff1c0584c78fadf78d96b6daef8e78b772bee4e6b4278c025c5f2b22f0688ed3f8bcdea6d54cb6154727cf0d7c53372d908d7d1fb80a401
+Size (xnedit-1.4.0.tar.gz) = 1509634 bytes
+SHA1 (patch-source_Makefile.common) = 337bc0d1ae32a448b6bb0c6141b096dba3654a78
+SHA1 (patch-source_textSel.c) = e6b365de6d6dd58e0df125baf3011a69671eafbe

Index: pkgsrc/editors/xnedit/patches/patch-source_Makefile.common
diff -u /dev/null pkgsrc/editors/xnedit/patches/patch-source_Makefile.common:1.1
--- /dev/null   Fri Jan 28 11:50:12 2022
+++ pkgsrc/editors/xnedit/patches/patch-source_Makefile.common  Fri Jan 28 11:50:12 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-source_Makefile.common,v 1.1 2022/01/28 11:50:12 micha Exp $
+
+Honor LDFLAGS.
+
+Upstream ticket: <https://sourceforge.net/p/xnedit/bugs/19/>
+Fixed with commit 8e9bf66e77b7108f5803c9945f6d799d11fa6091, remove this patch
+for next release.
+
+--- source/Makefile.common.orig        2022-01-09 12:28:40.000000000 +0000
++++ source/Makefile.common
+@@ -21,11 +21,11 @@ all: xnedit xnc
+ xnedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB)
+       $(CC) $(CFLAGS) -c linkdate.c -o linkdate.o
+       $(CC) $(CFLAGS) $(OBJS) linkdate.o \
+-       ../util/libNUtil.a $(XMLLIB) $(XLTLIB) $(LIBS) -o $@
++       ../util/libNUtil.a $(LDFLAGS) $(XMLLIB) $(XLTLIB) $(LIBS) -o $@
+ 
+ # Note LIBS isn't quite right here; it links unnecessarily against Motif
+ xnc: nc.o server_common.o ../util/libNUtil.a
+-      $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@
++      $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LDFLAGS) $(LIBS) -o $@
+ 
+ help.o: help.c
+       $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
Index: pkgsrc/editors/xnedit/patches/patch-source_textSel.c
diff -u /dev/null pkgsrc/editors/xnedit/patches/patch-source_textSel.c:1.1
--- /dev/null   Fri Jan 28 11:50:12 2022
+++ pkgsrc/editors/xnedit/patches/patch-source_textSel.c        Fri Jan 28 11:50:12 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-source_textSel.c,v 1.1 2022/01/28 11:50:12 micha Exp $
+
+Enable codepath for Apple operating systems unconditionally.
+
+Otherwise inserting the X11 primary selection does not work in some cases
+(e.g. with selections from FLTK widgets on NetBSD).
+
+Upstream ticket: <https://sourceforge.net/p/xnedit/bugs/18/>
+Fixed with commit 20e0de407a217a279f229c216288a5f8aa1b309f, remove this patch
+for next release.
+
+--- source/textSel.c.orig      2022-01-09 12:28:40.000000000 +0000
++++ source/textSel.c
+@@ -251,7 +251,9 @@ void InsertPrimarySelection(Widget w, Ti
+     
+     selectionTime = time;
+     
+-#ifdef __APPLE__
++
++/* #ifdef __APPLE__ */
++#if 1
+     XtGetSelectionValue(w, XA_PRIMARY, targets[1], getSelectionCB, sel, time);
+     XtGetSelectionValue(w, XA_PRIMARY, targets[0], getSelectionCB, sel, time);
+ #else

Prev by Date: CVS commit: pkgsrc/databases/gom
Next by Date: CVS commit: pkgsrc/devel/libgweather
Previous by Thread: CVS commit: pkgsrc/databases/gom
Next by Thread: CVS commit: pkgsrc/devel/libgweather
Indexes:

Home | Main Index | Thread Index | Old Index