From 763e4b61ace134887200b4122fc91e7bf325901b Mon Sep 17 00:00:00 2001 From: Michael Obster Date: Sat, 29 Nov 2003 12:20:39 +0000 Subject: [PATCH] Michael Obster : ddd: update to version 3.3.8 libmikmod: is not an active project at the moment -> URL has changed openmotif: 2.2.2 has some bigger bugs and nedit makes problems with that library. The 2.1.30 is known as very stable, but also with bugs. But there is group at metrolink which have fixed the bugs in this version. --> patch for downgrade openmotif to 2.1.30-4-MLI --> patch to disable install wrapper, because this version doesn't produce shared files errors nedit: only tested with openmotif!!! Please test it also with lestiff! update to version 5.4 (this version doesn't want openmotif 2.2.2, so please downgrade openmotif before) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1881 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/praenti/ddd/ddd.desc | 4 +- package/praenti/libmikmod/libmikmod.desc | 2 +- package/praenti/nedit/nedit-5.3-makefile.diff | 74 --------- package/praenti/nedit/nedit-5.4-makefile.diff | 29 ++++ package/praenti/nedit/nedit.conf | 2 +- package/praenti/nedit/nedit.desc | 4 +- .../openmotif/Imakefile-openmotif-2.1.30.diff | 13 ++ package/praenti/openmotif/animate-demo.patch | 33 ---- .../praenti/openmotif/duplicate-file.patch | 150 ------------------ package/praenti/openmotif/include-order.patch | 33 ---- package/praenti/openmotif/openmotif.conf | 20 ++- package/praenti/openmotif/openmotif.desc | 4 +- 13 files changed, 68 insertions(+), 301 deletions(-) delete mode 100644 package/praenti/nedit/nedit-5.3-makefile.diff create mode 100644 package/praenti/nedit/nedit-5.4-makefile.diff create mode 100644 package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff delete mode 100644 package/praenti/openmotif/animate-demo.patch delete mode 100644 package/praenti/openmotif/duplicate-file.patch delete mode 100644 package/praenti/openmotif/include-order.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 639852ad2..dcf39ca9e 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -12,6 +12,7 @@ - Sebastian Jaenicke: fixed screen security issue updated postgresql added ypserv .init script and sysstat + - Michael Obster: praenti repository updates *) 2003-11-27 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/package/praenti/ddd/ddd.desc b/package/praenti/ddd/ddd.desc index 2ddd6935f..773acaf71 100644 --- a/package/praenti/ddd/ddd.desc +++ b/package/praenti/ddd/ddd.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.3.7 +[V] 3.3.8 [P] X -----5---9 863.000 -[D] 2795023006 ddd-3.3.7.tar.gz ftp://ftp.gnu.org/gnu/ddd/ +[D] 2668961547 ddd-3.3.8.tar.gz ftp://ftp.gnu.org/gnu/ddd/ diff --git a/package/praenti/libmikmod/libmikmod.desc b/package/praenti/libmikmod/libmikmod.desc index 0ee32c21f..57be26510 100644 --- a/package/praenti/libmikmod/libmikmod.desc +++ b/package/praenti/libmikmod/libmikmod.desc @@ -42,5 +42,5 @@ [V] 3.1.10 [P] X -----5---9 457.000 -[D] 1850153016 libmikmod-3.1.10.tar.gz http://www.mikmod.org/files/libmikmod/ +[D] 1850153016 libmikmod-3.1.10.tar.gz http://www.ibiblio.org/pub/linux/apps/sound/libs/ 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 242269e14..000000000 --- a/package/praenti/nedit/nedit-5.3-makefile.diff +++ /dev/null @@ -1,74 +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 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- 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.4-makefile.diff b/package/praenti/nedit/nedit-5.4-makefile.diff new file mode 100644 index 000000000..d55296a29 --- /dev/null +++ b/package/praenti/nedit/nedit-5.4-makefile.diff @@ -0,0 +1,29 @@ +diff -Nur nedit-5.4-old/makefiles/Makefile.linux nedit-5.4/makefiles/Makefile.linux +--- nedit-5.4-old/makefiles/Makefile.linux 2003-11-22 11:42:32.968085128 +0100 ++++ nedit-5.4/makefiles/Makefile.linux 2003-11-22 11:45:14.896468272 +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 -lXmu + + include Makefile.common + +diff -Nur nedit-5.4-old/source/preferences.c nedit-5.4/source/preferences.c +--- nedit-5.4-old/source/preferences.c 2003-11-22 11:42:33.023076768 +0100 ++++ nedit-5.4/source/preferences.c 2003-11-22 11:47:31.771660080 +0100 +@@ -318,7 +318,7 @@ + #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", diff --git a/package/praenti/nedit/nedit.conf b/package/praenti/nedit/nedit.conf index ac276c74f..22872caee 100644 --- a/package/praenti/nedit/nedit.conf +++ b/package/praenti/nedit/nedit.conf @@ -24,7 +24,7 @@ nedit_main() { echo "patching Makefile ..." -patch -p1 < $confdir/nedit-5.3-makefile.diff +patch -p1 < $confdir/nedit-5.4-makefile.diff cp makefiles/Makefile.linux . sed "s:-O:${CFLAGS} -D__LINUX__:" \ diff --git a/package/praenti/nedit/nedit.desc b/package/praenti/nedit/nedit.desc index 353d6b96b..e8c1c1b83 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.4 [P] X -----5---9 882.000 -[D] 4086107404 nedit-5.3-source.tar.bz2 http://nedit.org/ftp/v5_3/ +[D] 1954564173 nedit-5.4-source.tar.bz2 http://nedit.org/ftp/v5_4/ diff --git a/package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff b/package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff new file mode 100644 index 000000000..5d76fa9c7 --- /dev/null +++ b/package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff @@ -0,0 +1,13 @@ +diff -Nur motif-vanilla/config/Imakefile motif/config/Imakefile +--- motif-vanilla/config/Imakefile 2003-11-22 15:54:21.032310256 +0100 ++++ motif/config/Imakefile 2003-11-22 15:55:04.876644904 +0100 +@@ -5,8 +5,7 @@ + #undef BootstrapCleanSubdirs + #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" + +-BOOTSTRAPSUBDIRS = imake makedepend +-SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util ++SUBDIRS = + + MakeSubdirs($(SUBDIRS)) + DependSubdirs($(SUBDIRS)) diff --git a/package/praenti/openmotif/animate-demo.patch b/package/praenti/openmotif/animate-demo.patch deleted file mode 100644 index bba5608a6..000000000 --- a/package/praenti/openmotif/animate-demo.patch +++ /dev/null @@ -1,33 +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/openmotif/animate-demo.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- openmotif-2.2.2-old/demos/programs/animate/Makefile.in Thu Feb 14 08:15:51 2002 -+++ openmotif-2.2.2/demos/programs/animate/Makefile.in Fri Aug 9 15:18:21 2002 -@@ -96,7 +96,7 @@ - README animate.help animate.man xmanimate.man - - --animate_SOURCES = xmanimate.c animate.c -+animate_SOURCES = xmanimate.c - - CLEANFILES = dog.uid plane.uid superman.uid xmanimate.uid - diff --git a/package/praenti/openmotif/duplicate-file.patch b/package/praenti/openmotif/duplicate-file.patch deleted file mode 100644 index 06cf4a19b..000000000 --- a/package/praenti/openmotif/duplicate-file.patch +++ /dev/null @@ -1,150 +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/openmotif/duplicate-file.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -Nur openMotif-2.2.2-org/demos/programs/Column/Makefile.in openMotif-2.2.2/demos/programs/Column/Makefile.in ---- openMotif-2.2.2-org/demos/programs/Column/Makefile.in 2003-04-28 17:10:53.000000000 +0200 -+++ openMotif-2.2.2/demos/programs/Column/Makefile.in 2003-04-28 17:12:34.000000000 +0200 -@@ -90,17 +90,17 @@ - - datadir = ${prefix}/share/Xm/Column - --bin_PROGRAMS = column --column_SOURCES = column.c -+bin_PROGRAMS = Column -+Column_SOURCES = column.c - EXTRA_DIST = Imakefile Column.ad --data_DATA = $(EXTRA_DIST) $(column_SOURCES) -+data_DATA = $(EXTRA_DIST) $(Column_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - INCLUDES = -I$(srcdir)/$(TOPDIR)/lib ${X_CFLAGS} - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../include/config.h - CONFIG_CLEAN_FILES = --bin_PROGRAMS = column$(EXEEXT) -+bin_PROGRAMS = Column$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - -@@ -112,10 +112,10 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --column_OBJECTS = column.$(OBJEXT) --column_LDADD = $(LDADD) --column_DEPENDENCIES = $(TOPDIR)/lib/Xm/libXm.la --column_LDFLAGS = -+Column_OBJECTS = column.$(OBJEXT) -+Column_LDADD = $(LDADD) -+Column_DEPENDENCIES = $(TOPDIR)/lib/Xm/libXm.la -+Column_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -130,8 +130,8 @@ - - TAR = gtar - GZIP_ENV = --best --SOURCES = $(column_SOURCES) --OBJECTS = $(column_OBJECTS) -+SOURCES = $(Column_SOURCES) -+OBJECTS = $(Column_OBJECTS) - - all: all-redirect - .SUFFIXES: -@@ -213,9 +213,9 @@ - - maintainer-clean-libtool: - --column$(EXEEXT): $(column_OBJECTS) $(column_DEPENDENCIES) -- @rm -f column$(EXEEXT) -- $(LINK) $(column_LDFLAGS) $(column_OBJECTS) $(column_LDADD) $(LIBS) -+Column$(EXEEXT): $(Column_OBJECTS) $(Column_DEPENDENCIES) -+ @rm -f Column$(EXEEXT) -+ $(LINK) $(Column_LDFLAGS) $(Column_OBJECTS) $(Column_LDADD) $(LIBS) - - install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) -diff -Nur openMotif-2.2.2-org/demos/programs/Tree/Makefile.in openMotif-2.2.2/demos/programs/Tree/Makefile.in ---- openMotif-2.2.2-org/demos/programs/Tree/Makefile.in 2003-04-28 17:10:53.000000000 +0200 -+++ openMotif-2.2.2/demos/programs/Tree/Makefile.in 2003-04-28 17:12:34.000000000 +0200 -@@ -91,9 +91,9 @@ - datadir = ${prefix}/share/Xm/Tree - - EXTRA_DIST = Imakefile --bin_PROGRAMS = tree --tree_SOURCES = bxutil-c.c tree.c --data_DATA = $(EXTRA_DIST) $(tree_SOURCES) -+bin_PROGRAMS = Tree -+Tree_SOURCES = bxutil-c.c tree.c -+data_DATA = $(EXTRA_DIST) $(Tree_SOURCES) - TOPDIR = ../../.. - LDADD = $(TOPDIR)/lib/Xm/libXm.la - -@@ -101,7 +101,7 @@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../include/config.h - CONFIG_CLEAN_FILES = --bin_PROGRAMS = tree$(EXEEXT) -+bin_PROGRAMS = Tree$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - -@@ -113,10 +113,10 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --tree_OBJECTS = bxutil-c.$(OBJEXT) tree.$(OBJEXT) --tree_LDADD = $(LDADD) --tree_DEPENDENCIES = $(TOPDIR)/lib/Xm/libXm.la --tree_LDFLAGS = -+Tree_OBJECTS = bxutil-c.$(OBJEXT) tree.$(OBJEXT) -+Tree_LDADD = $(LDADD) -+Tree_DEPENDENCIES = $(TOPDIR)/lib/Xm/libXm.la -+Tree_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -131,8 +131,8 @@ - - TAR = gtar - GZIP_ENV = --best --SOURCES = $(tree_SOURCES) --OBJECTS = $(tree_OBJECTS) -+SOURCES = $(Tree_SOURCES) -+OBJECTS = $(Tree_OBJECTS) - - all: all-redirect - .SUFFIXES: -@@ -214,9 +214,9 @@ - - maintainer-clean-libtool: - --tree$(EXEEXT): $(tree_OBJECTS) $(tree_DEPENDENCIES) -- @rm -f tree$(EXEEXT) -- $(LINK) $(tree_LDFLAGS) $(tree_OBJECTS) $(tree_LDADD) $(LIBS) -+Tree$(EXEEXT): $(Tree_OBJECTS) $(Tree_DEPENDENCIES) -+ @rm -f Tree$(EXEEXT) -+ $(LINK) $(Tree_LDFLAGS) $(Tree_OBJECTS) $(Tree_LDADD) $(LIBS) - - install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) diff --git a/package/praenti/openmotif/include-order.patch b/package/praenti/openmotif/include-order.patch deleted file mode 100644 index aa4c0e9ee..000000000 --- a/package/praenti/openmotif/include-order.patch +++ /dev/null @@ -1,33 +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/openmotif/include-order.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- openMotif-2.2.2-old/tools/wml/Makefile.in Thu Feb 14 08:15:49 2002 -+++ openmotif-2.2.2/tools/wml/Makefile.in Fri Aug 16 16:49:20 2002 -@@ -121,7 +121,7 @@ - - wmldbcreate_LDADD = ../../lib/Xm/libXm.la - --INCLUDES = ${X_CFLAGS} -I$(srcdir)/../../lib -I$(srcdir)/../../include -+INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../include ${X_CFLAGS} - - noinst_LIBRARIES = libwml.a - libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c diff --git a/package/praenti/openmotif/openmotif.conf b/package/praenti/openmotif/openmotif.conf index aa0ae5590..07873c48b 100644 --- a/package/praenti/openmotif/openmotif.conf +++ b/package/praenti/openmotif/openmotif.conf @@ -20,11 +20,25 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -prefix="usr/X11" ; set_confopt +build_motif() { + patch -p1 < ${confdir}/Imakefile-openmotif-2.1.30.diff -var_append INSTALL_WRAPPER_FILTER "|" \ - 'sed "s,man/man[123456789n]/.*\$,\\0openmotif,"' + mkdir -p imports/x11 + ln -vs $root/usr/X11R6/bin imports/x11/bin + ln -vs $root/usr/X11R6/include imports/x11/include + ln -vs $root/usr/X11R6/lib imports/x11/lib + eval $MAKE World + eval $MAKE install + eval $MAKE install.man +} + +# We need that for version 2.2.2. I'll let it here because we need this perhaps in the future again +#var_append INSTALL_WRAPPER_FILTER "|" \ +# 'sed "s,man/man[123456789n]/.*\$,\\0openmotif,"' hook_add postdoc 3 "rm -rf $docdir/man $docdir/Makefile*" hook_add postinstall 3 "register_wm $pkg ${pkg}-mwm /$prefix/bin/mwm" +custmain="build_motif" +srctar="openmotif-${ver}_MLI.src.tar.bz2" + diff --git a/package/praenti/openmotif/openmotif.desc b/package/praenti/openmotif/openmotif.desc index 3a20ea5ed..81a252318 100644 --- a/package/praenti/openmotif/openmotif.desc +++ b/package/praenti/openmotif/openmotif.desc @@ -41,8 +41,8 @@ [L] OpenSource [S] Stable -[V] 2.2.2 +[V] 2.1.30-4 [P] X -----5---9 360.000 -[D] 3337713851 openMotif-2.2.2.tar.gz ftp://ftp.sgi.com/other/motifzone/2.2/src/ +[D] 3553631073 openmotif-2.1.30-4_MLI.src.tar.gz ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/