pkgsrc-WIP-changes archive

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

xnedit: Remove, imported as editors/xnedit



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jan 28 13:09:54 2022 +0100
Changeset:	1347a20a0960fd5b6e122765236d066c5b9de414

Modified Files:
	Makefile
Removed Files:
	xnedit/DESCR
	xnedit/Makefile
	xnedit/PLIST
	xnedit/distinfo
	xnedit/patches/patch-source_Makefile.common
	xnedit/patches/patch-source_textSel.c

Log Message:
xnedit: Remove, imported as editors/xnedit

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1347a20a0960fd5b6e122765236d066c5b9de414

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

diffstat:
 Makefile                                    |  1 -
 xnedit/DESCR                                | 10 -----
 xnedit/Makefile                             | 61 -----------------------------
 xnedit/PLIST                                | 10 -----
 xnedit/distinfo                             |  7 ----
 xnedit/patches/patch-source_Makefile.common | 24 ------------
 xnedit/patches/patch-source_textSel.c       | 24 ------------
 7 files changed, 137 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 547fc42e97..90ee1d1eb1 100644
--- a/Makefile
+++ b/Makefile
@@ -5993,7 +5993,6 @@ SUBDIR+=	xmms-skins
 SUBDIR+=	xmms-volnorm
 SUBDIR+=	xmms2
 SUBDIR+=	xmoto
-SUBDIR+=	xnedit
 SUBDIR+=	xnee
 SUBDIR+=	xoo
 SUBDIR+=	xoreos
diff --git a/xnedit/DESCR b/xnedit/DESCR
deleted file mode 100644
index aceca33952..0000000000
--- a/xnedit/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-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.
diff --git a/xnedit/Makefile b/xnedit/Makefile
deleted file mode 100644
index 1741cd336a..0000000000
--- a/xnedit/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# $NetBSD$
-
-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"
diff --git a/xnedit/PLIST b/xnedit/PLIST
deleted file mode 100644
index 5ec6b644c0..0000000000
--- a/xnedit/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-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
diff --git a/xnedit/distinfo b/xnedit/distinfo
deleted file mode 100644
index 6590c398bd..0000000000
--- a/xnedit/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-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
diff --git a/xnedit/patches/patch-source_Makefile.common b/xnedit/patches/patch-source_Makefile.common
deleted file mode 100644
index 736805f8a0..0000000000
--- a/xnedit/patches/patch-source_Makefile.common
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-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 $@
diff --git a/xnedit/patches/patch-source_textSel.c b/xnedit/patches/patch-source_textSel.c
deleted file mode 100644
index d0bc6f672b..0000000000
--- a/xnedit/patches/patch-source_textSel.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-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


Home | Main Index | Thread Index | Old Index