New commits:
commit 8ed39c96bb414a8a8dcc659967185678aaa7ea69
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
fix nedit to build again; switch to openmotif, small feature patch (by
myself)
diff --git a/editors/nedit/BUILD b/editors/nedit/BUILD
index b3192d5..fc65df5 100755
--- a/editors/nedit/BUILD
+++ b/editors/nedit/BUILD
@@ -1,9 +1,13 @@
- patch -Np1 < ${SCRIPT_DIRECTORY}/lesstif-0.94.4-is-ok.patch
- cd ${SOURCE_DIRECTORY}/makefiles
&&
- cp Makefile.linux Makefile.linux.orig
&&
- sed "s/CFLAGS\=/CFLAGS:=-DBUILD_UNTESTED_NEDIT -DREPLACE_SCOPE /"
Makefile.linux.orig | \
- sed "s/-DUSE_LPR_PRINT_CMD/& \$\(CFLAGS\)/" |
\
- sed 's/\(LIBS=.*\)/\1 -lXft/' >
\
- Makefile.linux
&&
- cd ${SOURCE_DIRECTORY}
&&
- make linux
\ No newline at end of file
+if [[ "$NEDIT_WMCLASS" == "y" ]]
+then
+ patch -Np1 < ${SCRIPT_DIRECTORY}/nedit-5.5-svrname-in-wmclass.patch
+fi &&
+cd ${SOURCE_DIRECTORY}/makefiles &&
+mv Makefile.linux Makefile.linux.tmp &&
+sed -e "s/CFLAGS\=/CFLAGS:=-DBUILD_UNTESTED_NEDIT -DREPLACE_SCOPE /" \
+ -e "s/-DUSE_LPR_PRINT_CMD/& \$\(CFLAGS\)/" \
+ -e 's/\(LIBS=.*\) -Wl,-Bstatic -lXm -Wl,-Bdynamic \(.*\)/\1 -lXm \2
-lXft/' \
+ Makefile.linux.tmp > Makefile.linux &&
+rm Makefile.linux.tmp &&
+cd ${SOURCE_DIRECTORY} &&
+make linux
diff --git a/editors/nedit/CONFIGURE b/editors/nedit/CONFIGURE
new file mode 100755
index 0000000..d627002
--- /dev/null
+++ b/editors/nedit/CONFIGURE
@@ -0,0 +1 @@
+config_query NEDIT_WMCLASS "Enable hack for server name in WM_CLASS" n
diff --git a/editors/nedit/DEPENDS b/editors/nedit/DEPENDS
index 415c099..c598888 100755
--- a/editors/nedit/DEPENDS
+++ b/editors/nedit/DEPENDS
@@ -1 +1,5 @@
-depends lesstif
+# lesstif screws up at least on alpha:
+# attempt to copy to unlocked clipboard
+# clipboard then unusable until server restart
+# plus nedit folks are notorious about lesstif being problematic
+depends openmotif
diff --git a/editors/nedit/DETAILS b/editors/nedit/DETAILS
index 15687b3..59e9d55 100755
--- a/editors/nedit/DETAILS
+++ b/editors/nedit/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
ENTERED=20011120
UPDATED=20011213
LICENSE[0]=GPL
+ PATCHLEVEL=1
KEYWORDS="editors"
SHORT="NEdit is a multi-purpose text editor for the X Window
System"
cat << EOF
diff --git a/editors/nedit/HISTORY b/editors/nedit/HISTORY
old mode 100755
new mode 100644
index 8de11dc..cb56c09
--- a/editors/nedit/HISTORY
+++ b/editors/nedit/HISTORY
@@ -1,3 +1,11 @@
+2006-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, DEPENDS, lesstif-0.94.4-is-ok.patch: switched to openmotif
+ as upstream recommends, lesstif patch obsolete, now dynamic linking
+ * CONFIGURE, BUILD, nedit-5.5-svrname-in-wmclass.patch: added
+ feature patch to distinguish server instances by WM_CLASS in
+ window managers
+ * DETAILS: added PATCHLEVEL
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.