From 1640ec911cc245bc882f8ecd0009400966358e57 Mon Sep 17 00:00:00 2001 From: Michael Obster Date: Wed, 26 Jan 2005 15:54:22 +0000 Subject: [PATCH] Michael Obster : openmotif: version update to 2.2.3 [2005010318054903568] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5491 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../openmotif/Imakefile-openmotif-2.1.30.diff | 32 ------------------- package/praenti/openmotif/openmotif.conf | 27 +++------------- package/praenti/openmotif/openmotif.desc | 8 ++--- 3 files changed, 9 insertions(+), 58 deletions(-) delete mode 100644 package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff diff --git a/package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff b/package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff deleted file mode 100644 index b89a509ab..000000000 --- a/package/praenti/openmotif/Imakefile-openmotif-2.1.30.diff +++ /dev/null @@ -1,32 +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/Imakefile-openmotif-2.1.30.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 -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/openmotif.conf b/package/praenti/openmotif/openmotif.conf index 2ed67a00a..dc217b3dd 100644 --- a/package/praenti/openmotif/openmotif.conf +++ b/package/praenti/openmotif/openmotif.conf @@ -19,29 +19,12 @@ # file for details. # # --- ROCK-COPYRIGHT-NOTE-END --- +prefix="${root}usr/X11" +set_confopt -build_motif() { - patch -p1 < ${confdir}/Imakefile-openmotif-2.1.30.diff - - echo "#undef LinuxCLibMajorVersion" >> config/cf/site.def - echo "#define LinuxCLibMajorVersion 6" >> config/cf/site.def - - 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,"' +# We need that for version 2.2.x. 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 abf3e4be8..18eea011b 100644 --- a/package/praenti/openmotif/openmotif.desc +++ b/package/praenti/openmotif/openmotif.desc @@ -32,17 +32,17 @@ [T] platforms. Motif is also the base graphical user interface for the Common [T] Desktop Environment (CDE) and a number of other desktops. -[U] http://www.opengroup.org/openmotif +[U] http://www.motifzone.org -[A] Open Group Team +[A] Motifzone [M] Michael Obster [C] extra/development base/x11 [L] OpenSource [S] Stable -[V] 2.1.30-4 +[V] 2.2.3 [P] X -?---5---9 129.900 -[D] 3553631073 openmotif-2.1.30-4_MLI.src.tar.gz ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/ +[D] 2548184093 openMotif-2.2.3.tar.gz ftp://ftp.ics.com/pub/Products/Motif/om2.2.3/src/