From 2dc389e7764c7e070711c49c936620cb96905a42 Mon Sep 17 00:00:00 2001 From: Michael Obster Date: Wed, 26 Jan 2005 15:55:25 +0000 Subject: [PATCH] Michael Obster : nedit: version update to 5.5 [2005010318081404223] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5492 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/praenti/nedit/nedit-5.3-makefile.diff | 71 ------------------- package/praenti/nedit/nedit-5.5-makefile.diff | 46 ++++++++++++ package/praenti/nedit/nedit.conf | 4 +- package/praenti/nedit/nedit.desc | 4 +- 4 files changed, 50 insertions(+), 75 deletions(-) delete mode 100644 package/praenti/nedit/nedit-5.3-makefile.diff create mode 100644 package/praenti/nedit/nedit-5.5-makefile.diff diff --git a/package/praenti/nedit/nedit-5.3-makefile.diff b/package/praenti/nedit/nedit-5.3-makefile.diff deleted file mode 100644 index 94d35aaf2..000000000 --- a/package/praenti/nedit/nedit-5.3-makefile.diff +++ /dev/null @@ -1,71 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/praenti/nedit/nedit-5.3-makefile.diff -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -urN nedit-5.3.old/makefiles/Makefile.linux nedit-5.3/makefiles/Makefile.linux ---- nedit-5.3.old/makefiles/Makefile.linux 2002-03-07 08:42:55.000000000 -0800 -+++ nedit-5.3/makefiles/Makefile.linux 2003-07-25 16:13:00.000000000 -0800 -@@ -5,7 +5,7 @@ - # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS - # If using a Motif 2.1 compatible library (LessTif, OM) add - # a '-lXp' in front of the -lXext in LIBS. You also drop the --# -lXpm from that list. -+# from that list. - # Ensure that the Motif/LessTif headers and libs are found! - # e.g. you may have to add something like - # -I/usr/lesstif/include to CFLAGS and -@@ -14,8 +14,8 @@ - # To evaluate an alternative layout for the Replace/Find dialog, add - # -DREPLACE_SCOPE to the CFLAGS. See the README file for more information. - # --CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -+CFLAGS=-O -I/usr/X11R6/include -D__LINUX__ -DUSE_DIRENT -DUSE_LPR_PRINT_CMD - ARFLAGS=-urs --LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm -+LIBS= -L/usr/X11R6/lib -lXm -lXp -lXext -lXt -lSM -lICE -lX11 -lm -lXmu - - include Makefile.common -diff -urN nedit-5.3.old/source/preferences.c nedit-5.3/source/preferences.c ---- nedit-5.3.old/source/preferences.c 2002-05-16 00:53:09.000000000 -0700 -+++ nedit-5.3/source/preferences.c 2003-01-19 17:44:57.000000000 -0800 -@@ -271,14 +271,14 @@ - #ifndef VMS - #ifdef linux - {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\ -- cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\ -+ cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\ - wc::w:ED:\nset wc=`wc`; echo $wc[1] \"lines,\" $wc[2] \"words,\" $wc[3] \"characters\"\n\ - sort::o:EX:\nsort\nnumber lines::n:AW:\nnl -ba\nmake:Alt+Z:m:W:\nmake\n\ - expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n", - &TempStringPrefs.shellCmds, NULL, True}, - #elif __FreeBSD__ - {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\ -- cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\ -+ cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\ - wc::w:ED:\nset wc=`wc`; echo $wc[1] \"words,\" $wc[2] \"lines,\" $wc[3] \"characters\"\n\ - sort::o:EX:\nsort\nnumber lines::n:AW:\npr -tn\nmake:Alt+Z:m:W:\nmake\n\ - expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n", -@@ -786,6 +786,8 @@ - {"shell", "Shell", PREF_STRING, - #if defined(__MVS__) || defined(__EMX__) - "/bin/sh", -+#elif __LINUX__ -+ "/bin/sh", - #else - "/bin/csh", - #endif diff --git a/package/praenti/nedit/nedit-5.5-makefile.diff b/package/praenti/nedit/nedit-5.5-makefile.diff new file mode 100644 index 000000000..b4d764267 --- /dev/null +++ b/package/praenti/nedit/nedit-5.5-makefile.diff @@ -0,0 +1,46 @@ +diff -Nur nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux +--- nedit-5.5-orig/makefiles/Makefile.linux 2005-01-03 16:27:48.636034664 +0100 ++++ nedit-5.5/makefiles/Makefile.linux 2005-01-03 16:30:00.425999544 +0100 +@@ -17,11 +17,11 @@ + # To test if the Motif library exports the runtime version + # add -DHAVE__XMVERSIONSTRING to CFLAGS + # +-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD ++CFLAGS=-O -I/usr/X11R6/include -D__LINUX__ -DUSE_DIRENT -DUSE_LPR_PRINT_CMD + + ARFLAGS=-urs + +-LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm ++LIBS= -L/usr/X11R6/lib -lXm -lXp -lXext -lXt -lSM -lICE -lX11 -lm + + include Makefile.common + +diff -Nur nedit-5.5-orig/source/preferences.c nedit-5.5/source/preferences.c +--- nedit-5.5-orig/source/preferences.c 2005-01-03 16:27:48.711023264 +0100 ++++ nedit-5.5/source/preferences.c 2005-01-03 16:32:42.992285712 +0100 +@@ -335,14 +335,14 @@ + #ifndef VMS + #ifdef linux + {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\ +- cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\ ++ cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\ + wc::w:ED:\nwc | awk '{print $1 \" lines, \" $2 \" words, \" $3 \" characters\"}'\n\ + sort::o:EX:\nsort\nnumber lines::n:AW:\nnl -ba\nmake:Alt+Z:m:W:\nmake\n\ + expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n", + &TempStringPrefs.shellCmds, NULL, True}, + #elif __FreeBSD__ + {"shellCommands", "ShellCommands", PREF_ALLOC_STRING, "spell:Alt+B:s:EX:\n\ +- cat>spellTmp; xterm -e ispell -x spellTmp; cat spellTmp; rm spellTmp\n\ ++ cat>spellTmp; xterm -e aspell -c -x spellTmp; cat spellTmp; rm spellTmp\n\ + wc::w:ED:\nwc | awk '{print $2 \" lines, \" $1 \" words, \" $3 \" characters\"}'\n\ + sort::o:EX:\nsort\nnumber lines::n:AW:\npr -tn\nmake:Alt+Z:m:W:\nmake\n\ + expand::p:EX:\nexpand\nunexpand::u:EX:\nunexpand\n", +@@ -928,6 +928,8 @@ + {"shell", "Shell", PREF_STRING, + #if defined(__MVS__) || defined(__EMX__) + "/bin/sh", ++#elif __LINUX__ ++ "/bin/sh", + #else + "/bin/csh", + #endif diff --git a/package/praenti/nedit/nedit.conf b/package/praenti/nedit/nedit.conf index 30271b150..d51ed56d0 100644 --- a/package/praenti/nedit/nedit.conf +++ b/package/praenti/nedit/nedit.conf @@ -23,7 +23,7 @@ nedit_main() { echo "patching Makefile ..." - patch -p1 < $confdir/nedit-5.3-makefile.diff + patch -p1 < $confdir/nedit-5.5-makefile.diff sed -i "s:-O:${CFLAGS} -D__LINUX__:" makefiles/Makefile.linux @@ -33,6 +33,6 @@ nedit_main() cp -v source/nedit $root/usr/bin } -srctar="nedit-${ver}-source.tar.bz2" +srctar="nedit-${ver}-src.tar.bz2" custmain="nedit_main" diff --git a/package/praenti/nedit/nedit.desc b/package/praenti/nedit/nedit.desc index 48ee34473..b1d11f567 100644 --- a/package/praenti/nedit/nedit.desc +++ b/package/praenti/nedit/nedit.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 5.3 +[V] 5.5 [P] X -?---5---9 211.500 -[D] 4086107404 nedit-5.3-source.tar.bz2 http://nedit.org/ftp/v5_3/ +[D] 1977077526 nedit-5.5-src.tar.bz2 http://www.nedit.org/ftp/v5_5/