diff options
21 files changed, 504 insertions, 411 deletions
diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog index 1c7a965aab98..bde0628f28c0 100644 --- a/x11-libs/lesstif/ChangeLog +++ b/x11-libs/lesstif/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/lesstif # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.60 2005/04/01 19:01:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.61 2005/04/26 13:56:46 lanius Exp $ + +*lesstif-0.94.4 (26 Apr 2005) +*lesstif-0.93.94-r4 (26 Apr 2005) + + 26 Apr 2005; Heinrich Wendel <lanius@gentoo.org> + -lesstif-0.93.94-r3.ebuild, +lesstif-0.93.94-r4.ebuild, + -lesstif-0.94.0-r6.ebuild, +lesstif-0.94.0-r7.ebuild: + update to latest motif-config version 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> lesstif-0.94.0-r2.ebuild: stable on ia64 diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3 deleted file mode 100644 index 1ad7cd16a89f..000000000000 --- a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827 -MD5 411faaae59989c0cc06c5d5c5d1501ed lesstif1-1_0.93.94-11.1.diff.gz 63754 diff --git a/x11-libs/lesstif/files/digest-lesstif-0.93.94-r4 b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r4 new file mode 100644 index 000000000000..ef64d7ddbc7a --- /dev/null +++ b/x11-libs/lesstif/files/digest-lesstif-0.93.94-r4 @@ -0,0 +1,2 @@ +MD5 6ae7340d91ba0566676bd3abb3842203 lesstif-0.93.94.tar.bz2 3461827 +MD5 a7ef671a2f9b5e83a082b223e33b986d lesstif1-1_0.93.94-11.2.diff.gz 110235 diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6 b/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6 deleted file mode 100644 index 86a358232318..000000000000 --- a/x11-libs/lesstif/files/digest-lesstif-0.94.0-r6 +++ /dev/null @@ -1 +0,0 @@ -MD5 20f38a06c863e0c51ca0c862ef039601 lesstif-0.94.0.tar.bz2 2425210 diff --git a/x11-libs/lesstif/files/digest-lesstif-0.94.4 b/x11-libs/lesstif/files/digest-lesstif-0.94.4 new file mode 100644 index 000000000000..a157b92c057f --- /dev/null +++ b/x11-libs/lesstif/files/digest-lesstif-0.94.4 @@ -0,0 +1 @@ +MD5 3096ca456c0bc299d895974d307c82d8 lesstif-0.94.4.tar.bz2 2447156 diff --git a/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild deleted file mode 100644 index cda640f6fdfd..000000000000 --- a/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild,v 1.5 2005/04/19 11:23:48 lanius Exp $ - -# disable sandbox, needed for motif-config -SANDBOX_DISABLED="1" - -inherit libtool flag-o-matic multilib - -DESCRIPTION="An OSF/Motif(R) clone" -HOMEPAGE="http://www.lesstif.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://debian/pool/main/l/lesstif1-1/lesstif1-1_0.93.94-11.1.diff.gz" - -LICENSE="LGPL-2" -SLOT="1.2" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc ~x86 ~ia64" -IUSE="static" - -DEPEND="virtual/libc - virtual/x11 - >=x11-libs/motif-config-0.6" - -PROVIDE="virtual/motif" - -src_unpack() { - # profile stuff - motif-config --start-install - - unpack ${A} - cd ${S} - epatch ${DISTDIR}/lesstif1-1_0.93.94-11.1.diff.gz -} - -src_compile() { - use ppc-macos || elibtoolize - - if use ppc-macos; then - append-ldflags -L/usr/X11R6/lib -lX11 -lXt - fi - - econf \ - $(use_enable static) \ - --enable-production \ - --enable-verbose=no \ - --enable-build-12 \ - --disable-build-20 \ - --disable-build-21 \ - --with-x || die "./configure failed" - - emake CFLAGS="${CFLAGS}" || die -} - -src_install() { - make DESTDIR=${D} install || die "make install" - - - einfo "Fixing binaries" - dodir /usr/$(get_libdir)/lesstif-1.2 - for file in `ls ${D}/usr/bin` - do - mv ${D}/usr/bin/${file} ${D}/usr/$(get_libdir)/lesstif-1.2/${file} - done - - einfo "Fixing libraries" - mv ${D}/usr/lib/* ${D}/usr/$(get_libdir)/lesstif-1.2/ - - einfo "Fixing includes" - dodir /usr/include/lesstif-1.2/ - mv ${D}/usr/include/* ${D}/usr/include/lesstif-1.2 - - einfo "Fixing man pages" - mans="1 3 5" - for man in $mans; do - dodir /usr/share/man/man${man} - for file in `ls ${D}/usr/share/man/man${man}` - do - file=${file/.${man}/} - mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-lesstif-1.2.${man} - done - done - - - einfo "Fixing docs" - dodir /usr/share/doc/ - mv ${D}/usr/LessTif ${D}/usr/share/doc/${P} - rm -fR ${D}/usr/$(get_libdir)/LessTif - - # cleanup - rm -f ${D}/usr/$(get_libdir)/lesstif-1.2/mxmkmf - rm -fR ${D}/usr/share/aclocal/ - rm -fR ${D}/usr/$(get_libdir)/lesstif-1.2/LessTif/ - rm -fR ${D}/usr/$(get_libdir)/lesstif-1.2/X11/ - rm -fR ${D}/usr/$(get_libdir)/X11/ - - # profile stuff - motif-config --finish-install -} - -# Profile stuff -#pkg_setup() { -# if has_version =x11-libs/lesstif-0.93.94*; then touch /tmp/lesstif-1.2; fi -#} - -pkg_postinst() { - motif-config --install lesstif-1.2 -} - -#pkg_prerm() { -# [ -f /tmp/lesstif-1.2 ] && rm -f /tmp/lesstif-1.2 || motif-config --uninstall lesstif-1.2 -#} diff --git a/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild index f089efaca977..397bba4bd78a 100644 --- a/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild +++ b/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild @@ -1,9 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild,v 1.1 2005/04/26 13:56:47 lanius Exp $ - -# disable sandbox, needed for motif-config -SANDBOX_DISABLED="1" +# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r4.ebuild,v 1.2 2005/04/26 13:58:54 lanius Exp $ inherit libtool flag-o-matic multilib diff --git a/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild deleted file mode 100644 index e2f121f8fde7..000000000000 --- a/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild,v 1.5 2005/04/19 11:22:46 lanius Exp $ - -# disable sandbox, needed for motif-config -SANDBOX_DISABLED="1" - -inherit libtool flag-o-matic multilib - -DESCRIPTION="An OSF/Motif(R) clone" -HOMEPAGE="http://www.lesstif.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="2.1" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc ~x86 ~ia64" -IUSE="static" - -DEPEND="virtual/libc - virtual/x11 - >=x11-libs/motif-config-0.5" - -PROVIDE="virtual/motif" - -src_unpack() { - # profile stuff - motif-config --start-install - - unpack ${A} - cd ${S} - epatch ${FILESDIR}/CAN-2005-0605.patch -} - -src_compile() { - use ppc-macos || libtoolize --force --copy - - if use ppc-macos; then - append-ldflags -L/usr/X11R6/lib -lX11 -lXt - fi - - econf \ - $(use_enable static) \ - --enable-production \ - --enable-verbose=no \ - --with-x || die "./configure failed" - - emake CFLAGS="${CFLAGS}" || die -} - -src_install() { - make DESTDIR=${D} install || die "make install" - - - einfo "Fixing binaries" - dodir /usr/$(get_libdir)/lesstif-2.1 - for file in `ls ${D}/usr/bin` - do - mv ${D}/usr/bin/${file} ${D}/usr/$(get_libdir)/lesstif-2.1/${file} - done - - einfo "Fixing libraries" - mv ${D}/usr/lib/* ${D}/usr/$(get_libdir)/lesstif-2.1/ - - einfo "Fixing includes" - dodir /usr/include/lesstif-2.1/ - mv ${D}/usr/include/* ${D}/usr/include/lesstif-2.1 - - einfo "Fixing man pages" - mans="1 3 5" - for man in $mans; do - dodir /usr/share/man/man${man} - for file in `ls ${D}/usr/share/man/man${man}` - do - file=${file/.${man}/} - mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-lesstif-2.1.${man} - done - done - - - einfo "Fixing docs" - dodir /usr/share/doc/ - mv ${D}/usr/LessTif ${D}/usr/share/doc/${P} - rm -fR ${D}/usr/$(get_libdir)/LessTif - - # cleanup - rm -f ${D}/usr/$(get_libdir)/lesstif-2.1/mxmkmf - rm -fR ${D}/usr/share/aclocal/ - rm -fR ${D}/usr/$(get_libdir)/lesstif-2.1/LessTif/ - rm -fR ${D}/usr/$(get_libdir)/lesstif-2.1/X11/ - rm -fR ${D}/usr/$(get_libdir)/X11/ - - # profile stuff - motif-config --finish-install -} - -# Profile stuff -#pkg_setup() { -# if has_version ">=x11-libs/lesstif-0.94.0"; then touch /tmp/lesstif-2.1; fi -#} - -pkg_postinst() { - motif-config --install lesstif-2.1 -} - -#pkg_prerm() { -# [ -f /tmp/lesstif-2.1 ] && rm -f /tmp/lesstif-2.1 || motif-config --uninstall lesstif-2.1 -#} diff --git a/x11-libs/lesstif/lesstif-0.94.4.ebuild b/x11-libs/lesstif/lesstif-0.94.4.ebuild index e74f78040978..d2d1f2357500 100644 --- a/x11-libs/lesstif/lesstif-0.94.4.ebuild +++ b/x11-libs/lesstif/lesstif-0.94.4.ebuild @@ -1,9 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.4.ebuild,v 1.1 2005/04/26 13:56:47 lanius Exp $ - -# disable sandbox, needed for motif-config -SANDBOX_DISABLED="1" +# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.4.ebuild,v 1.2 2005/04/26 13:58:54 lanius Exp $ inherit libtool flag-o-matic multilib diff --git a/x11-libs/motif-config/ChangeLog b/x11-libs/motif-config/ChangeLog index a56d7db7017d..8ff51723a8e2 100644 --- a/x11-libs/motif-config/ChangeLog +++ b/x11-libs/motif-config/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/motif-config # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/ChangeLog,v 1.12 2005/03/25 07:27:38 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/ChangeLog,v 1.13 2005/04/26 13:56:50 lanius Exp $ + +*motif-config-0.9 (26 Apr 2005) + + 26 Apr 2005; Heinrich Wendel <lanius@gentoo.org> +files/motif-config-0.9, + files/system.mwmrc, +motif-config-0.9.ebuild: + block old versions to prevent upgrade bugs; hopefully fix outstanding bugs *motif-config-0.8 (25 Mar 2005) diff --git a/x11-libs/motif-config/Manifest b/x11-libs/motif-config/Manifest index 9ea1b386ed19..5ef0d709b19f 100644 --- a/x11-libs/motif-config/Manifest +++ b/x11-libs/motif-config/Manifest @@ -1,25 +1,18 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 358a8ada853297e474f8fd40cd130705 motif-config-0.9.ebuild 2404 MD5 33bcba9885d6419bbb4e22eed35676ab motif-config-0.6.ebuild 1239 MD5 f18c8f14b63a3439113068b5a89e193b motif-config-0.8.ebuild 1239 -MD5 184853ab143f09f61dc9c65155271970 ChangeLog 2601 +MD5 47dbf9f52c73b0c93cf1cdc53fef61ad ChangeLog 2836 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253 MD5 b57f5a2346d07273acd7e675d3f5d8cc motif-config-0.7.ebuild 1239 MD5 76af3b1b80127315546ef5ea7f5875e1 files/bindings.tbz2 5342 MD5 ea7dd0dd1e039ef38db246c23f4d9422 files/motif-config-0.6 7347 MD5 850befc48daae3dd492f9e263c6dfd4a files/motif-config-0.7 7014 MD5 a4ba585f1a15d0800a1906e20659c1ce files/motif-config-0.8 7166 -MD5 beb566e653a0a239409d76dc502c87e1 files/system.mwmrc 4358 +MD5 3a565c0fb8345038591f50aa943aed1b files/motif-config-0.9 5403 +MD5 d46916eb64babb223c9c511cf7d042a6 files/system.mwmrc 2964 MD5 aaf04376f7011a2f68b7961100f611fb files/Mwm.defaults 536 MD5 b4cca983e552045606f845e17a00e1d6 files/bitmaps.tbz2 3165 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-motif-config-0.6 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-motif-config-0.7 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-motif-config-0.8 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCQ73ievY57Fted3ERAhI+AJ9ENOFhFjmAhDIiVzu/MDVs98Mc1ACeOhXR -QyqJpZ0+V2wFUa5Ji5vBOmw= -=j6Ol ------END PGP SIGNATURE----- +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-motif-config-0.9 0 diff --git a/x11-libs/motif-config/files/digest-motif-config-0.9 b/x11-libs/motif-config/files/digest-motif-config-0.9 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/x11-libs/motif-config/files/digest-motif-config-0.9 diff --git a/x11-libs/motif-config/files/motif-config-0.9 b/x11-libs/motif-config/files/motif-config-0.9 new file mode 100755 index 000000000000..d749184ccaf7 --- /dev/null +++ b/x11-libs/motif-config/files/motif-config-0.9 @@ -0,0 +1,289 @@ +#!/bin/bash +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# based on gcc-config by Martin Schlemmer <azarah@gentoo.org +# Author: Heinrich Wendel <lanius@gentoo.org> + +umask 022 + +PROFILE_PATH=/usr/@@LIBDIR@@/motif +CONFIG_FILE=${PROFILE_PATH}/current + +usage() { +cat << "USAGE_END" +Usage: motif-config [option] [profile] +Change the current motif profile, or give info about profiles. + +Options: + + -c, --get-current-profile Print current used motif profile. + + -l, --list-profiles Print a list of available profiles. + + -s, --set-profile Set the current profile. + + -L, --get-lib-path Print path where libraries of the given/current + profile are located. + + -I, --get-inc-path Print path where includes of the given/current + profile are located. + + --libs Print link flags for the given/current + profile. + + --cflags Print compilation flags for the given/current + profile. + +USAGE_END + exit $1 +} +[[ $# -lt 1 ]] && usage 1 +[[ $# -gt 2 ]] && usage 1 + +# redefine eerror/einfo to remove baselayout dep +# to make ppc-macos people happy +eerror() { + echo -e " \e[31;01m*\e[0m $*"; + exit 1 +} +einfo() { + echo -e " \e[32;01m*\e[0m $*"; +} + +_check_root() { + if [[ "$(id -u)" -ne 0 ]] ; then + eerror "$0: Must be root." + exit 1 + fi +} + +_activate_profile() { + _check_root + + if [ -z "${1}" ]; then + return 0 + fi + + # set new profile as default + new=${1} + files="" + # libs + for file in `ls /usr/@@LIBDIR@@/${new}/ | grep lib`; do + files="${files} /usr/@@LIBDIR@@/${file}" + rm -f /usr/@@LIBDIR@@/${file} + ln -s /usr/@@LIBDIR@@/${new}/${file} /usr/@@LIBDIR@@/${file} + done + # includes + for file in `ls /usr/include/${new}/`; do + files="${files} /usr/include/${file}" + rm -f /usr/include/${file} + ln -s /usr/include/${new}/${file} /usr/include/${file} + done + # binaries + for file in `ls /usr/@@LIBDIR@@/${new} | grep -v lib`; do + files="${files} /usr/bin/${file}" + rm -f /usr/bin/${file} + ln -s /usr/@@LIBDIR@@/${new}/${file} /usr/bin/${file} + done + # man pages + for file in `find /usr/share/man -regex ".*-${new}\..x?.gz"`; do + files="${files} ${file/-${new}/}" + rm -f ${file/-${new}/} + ln -s ${file} ${file/-${new}/} + done + + cat ${PROFILE_PATH}/${new} > ${CONFIG_FILE} + echo "FILES='${files}'" >> ${CONFIG_FILE} + + return $? +} + +_deactivate_profile() { + _check_root + + source ${CONFIG_FILE} 2>/dev/null + current=${PROFILE} + + if [ -z "$current" ]; then + return 0 + fi + + for file in ${FILES}; do + rm -f ${file} + done + + rm -f ${CONFIG_FILE} + + return $? +} + +switch_profile() { + _check_root + + if [ -n "$1" ]; then + if [ ! -e ${PROFILE_PATH}/${1} ]; then + eerror "$0: no such profile ${1}" + else + _deactivate_profile + _activate_profile $1 + fi + else + source ${CONFIG_FILE} 2> /dev/null + _deactivate_profile + if [ -z "${PROFILE}" -o ! -f ${PROFILE_PATH}/${PROFILE} ]; then + for y in `ls ${PROFILE_PATH} | grep -v removed | grep -v current | sort -r`; do + _activate_profile ${y} + break + done + if [ -z "${y}" ]; then + eerror "$0: no profile to activate" + fi + else + _activate_profile ${PROFILE} + fi + fi + + source ${CONFIG_FILE} 2>/dev/null + einfo "$0: New default Profile is: ${PROFILE}" + + return $? +} + +get_current_profile() { + source ${CONFIG_FILE} 2> /dev/null + echo ${PROFILE} +} + +list_profiles() { + i=1 + source ${CONFIG_FILE} 2> /dev/null + current=${PROFILE} + for y in `ls ${PROFILE_PATH} | grep -v current | grep -v removed`; do + source ${PROFILE_PATH}/${y} + output="[${i}] ${PROFILE}"; + if [ "${y}" = "${current}" ]; then + output="${output} *" + fi + echo "$output" + i=$((i + 1)) + done + exit $? +} + +get_lib_path() { + if [ "$1" != "" ]; then + file=${1} + else + file="current" + fi + source ${PROFILE_PATH}/${file} + if [ $? -eq 1 ]; then + eerror "$0: No such profile: $profile" + else + echo "/usr/@@LIBDIR@@/${PROFILE}/" + exit 0 + fi +} + +get_inc_path() { + if [ "$1" != "" ]; then + file=${1} + else + file="current" + fi + source ${PROFILE_PATH}/${file} + if [ $? -eq 1 ]; then + eerror "$0: No such profile: $profile" + else + echo "/usr/include/${PROFILE}/" + exit 0 + fi +} + +get_cflags() { + if [ "$1" != "" ]; then + file=${1} + else + file="current" + fi + source ${PROFILE_PATH}/${file} + if [ $? -eq 1 ]; then + eerror "$0: No such profile: $profile" + else + echo "-I/usr/include/${PROFILE}/" + exit 0 + fi +} + +get_libs() { + if [ "$1" != "" ]; then + file=${1} + else + file="current" + fi + source ${PROFILE_PATH}/${file} + if [ $? -eq 1 ]; then + eerror "$0: No such profile: $profile" + else + echo "-L/usr/@@LIBDIR@@/${PROFILE}/" + exit 0 + fi +} + +for x in "$@"; do + case "${x}" in + -c|--get-current-profile) + [[ $# -ne 1 ]] && usage 1 + get_current_profile + ;; + + -l|--list-profiles) + [[ $# -ne 1 ]] && usage 1 + list_profiles + ;; + + -s|--set-profile) + [[ $# -gt 2 ]] && usage 1 + switch_profile $2 + exit $? + ;; + + -L|--get-lib-path) + [[ $# -gt 2 ]] && usage 1 + get_lib_path $2 + ;; + + -I|--get-inc-path) + [[ $# -gt 2 ]] && usage 1 + get_inc_path $2 + ;; + + --cflags) + [[ $# -gt 2 ]] && usage 1 + get_cflags $2 + ;; + + --libs) + [[ $# -gt 2 ]] && usage 1 + get_libs $2 + ;; + + -h|--help) + usage 0 + ;; + + -v|--version) + echo "motif-config-0.9" + exit 0 + ;; + + -*) + usage 1 + ;; + + *) + usage 1 + ;; + + esac +done diff --git a/x11-libs/motif-config/files/system.mwmrc b/x11-libs/motif-config/files/system.mwmrc index d530bac6706f..eae1d6785dd6 100644 --- a/x11-libs/motif-config/files/system.mwmrc +++ b/x11-libs/motif-config/files/system.mwmrc @@ -1,125 +1,71 @@ -! -! @OPENGROUP_COPYRIGHT@ -! COPYRIGHT NOTICE -! Copyright (c) 1990, 1991, 1992, 1993 Open Software Foundation, Inc. -! Copyright (c) 1996, 1997, 1998, 1999, 2000 The Open Group -! ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for -! the full copyright text. -! -! This software is subject to an open license. It may only be -! used on, with or for operating systems which are themselves open -! source systems. You must contact The Open Group for a license -! allowing distribution and sublicensing of this software on, with, -! or for operating systems which are not Open Source programs. -! -! See http://www.opengroup.org/openmotif/license for full -! details of the license agreement. Any use, reproduction, or -! distribution of the program constitutes recipient's acceptance of -! this agreement. -! -! EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -! PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -! KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY -! WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -! OR FITNESS FOR A PARTICULAR PURPOSE -! -! EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -! NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, -! INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -! DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED -! AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -! LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -! ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -! EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -! POSSIBILITY OF SUCH DAMAGES. -! -! $XConsortium: system.mwmrc /main/9 1996/10/25 11:45:42 drk $ -! -! HISTORY -! - -!! -!! DEFAULT Mwm RESOURCE DESCRIPTION FILE (system.mwmrc) -!! -!! NOTE: To personalize this file, copy this file before editing it. -!! Personalize copies of the Mwm resource file typically -!! reside as: -!! -!! $HOME/.mwmrc !! - -!! -!! Root Menu Description (this menu must be explicitly posted via f.menu) +!! $Id: system.mwmrc,v 1.2 2005/04/26 13:56:50 lanius Exp $ +!! Root Menu Description !! - Menu DefaultRootMenu { - "Root Menu" f.title - "New Window" f.exec "xterm &" + "Root Menu" f.title + "New Window" f.exec "xterm -e /bin/bash &" "Shuffle Up" f.circle_up "Shuffle Down" f.circle_down - "Refresh" f.refresh + "Refresh" f.refresh "Pack Icons" f.pack_icons -! "Toggle Behavior..." f.set_behavior - no-label f.separator - "Restart..." f.restart - "Quit..." f.quit_mwm - -} - -Menu RootMenu_1.1 -{ - "Root Menu" f.title - "New Window" f.exec "xterm &" - "Shuffle Up" f.circle_up - "Shuffle Down" f.circle_down - "Refresh" f.refresh -! "Pack Icons" f.pack_icons -! "Toggle Behavior" f.set_behavior - no-label f.separator + "Toggle Behavior..." f.set_behavior + no-label f.separator "Restart..." f.restart + "Restart fvwm" f.restart - "fvwm" + "Screen next" f.screen - "next" + "Screen prev" f.screen - "prev" + "Screen back" f.screen - "back" + "Screen 0" f.screen - "0" + "Screen 1" f.screen - "1" + "Screen 3" f.screen - "3" + "Screen -1" f.screen - "-1" + "Quit..." f.quit_mwm } !! -!! Default Window Menu Description +!! Default Window Menu !! - Menu DefaultWindowMenu { Restore _R Alt<Key>F5 f.restore - Move _M Alt<Key>F7 f.move - Size _S Alt<Key>F8 f.resize - Minimize _n Alt<Key>F9 f.minimize - Maximize _x Alt<Key>F10 f.maximize - Lower _L Alt<Key>F3 f.lower + Move _M Alt<Key>F7 f.move + Size _S Alt<Key>F8 f.resize + Minimize _n Alt<Key>F9 f.minimize + Maximize _x Alt<Key>F10 f.maximize + Raise _a Alt<Key>F2 f.raise + Lower _L Alt<Key>F3 f.lower no-label f.separator - Close _C Alt<Key>F4 f.kill + Close _C Alt<Key>F4 f.kill } !! -!! Key Binding Description +!! Default Key Bindings !! - Keys DefaultKeyBindings { - Shift<Key>Escape window|icon f.post_wmenu - Alt<Key>space window|icon f.post_wmenu - Alt<Key>Tab root|icon|window f.next_key - Alt Shift<Key>Tab root|icon|window f.prev_key - Alt<Key>Escape root|icon|window f.circle_down - Alt Shift<Key>Escape root|icon|window f.circle_up + Shift<Key>Escape window|icon f.post_wmenu + Alt<Key>space window|icon f.post_wmenu + Alt<Key>Tab root|icon|window f.next_key + Alt Shift<Key>Tab root|icon|window f.prev_key + Alt<Key>Escape root|icon|window f.circle_down + Alt Shift<Key>Escape root|icon|window f.circle_up Alt Shift Ctrl<Key>exclam root|icon|window f.set_behavior - Alt<Key>F6 window f.next_key transient - Alt Shift<Key>F6 window f.prev_key transient - Shift<Key>F10 icon f.post_wmenu -! Alt Shift<Key>Delete root|icon|window f.restart + Alt<Key>F6 window f.next_key transient + Alt Shift<Key>F6 window f.prev_key transient + Shift<Key>F10 icon f.post_wmenu + Alt Shift<Key>Delete root|icon|window f.restart + <Key>F11 root|icon|window f.screen - "next" + Alt<Key>F11 root|icon|window f.screen - "prev" } !! !! Button Binding Description(s) !! - +!! These can be used anywhere +!! Buttons DefaultButtonBindings { <Btn1Down> icon|frame f.raise @@ -127,30 +73,34 @@ Buttons DefaultButtonBindings <Btn3Down> root f.menu DefaultRootMenu } -Buttons ExplicitButtonBindings -{ - <Btn1Down> frame|icon f.raise - <Btn3Down> frame|icon f.post_wmenu - <Btn3Down> root f.menu DefaultRootMenu -! <Btn1Up> icon f.restore - Alt<Btn1Down> window|icon f.lower -! Alt<Btn2Down> window|icon f.resize -! Alt<Btn3Down> window|icon f.move - -} - -Buttons PointerButtonBindings -{ - <Btn1Down> frame|icon f.raise - <Btn3Down> frame|icon f.post_wmenu - <Btn3Down> root f.menu DefaultRootMenu - <Btn1Down> window f.raise -! <Btn1Up> icon f.restore - Alt<Btn1Down> window|icon f.lower -! Alt<Btn2Down> window|icon f.resize -! Alt<Btn3Down> window|icon f.move -} - !! -!! END OF mwm RESOURCE DESCRIPTION FILE +!! These are some example bindings that you might use if your +!! keyboardFocusPolicy is "explicit". Note that to use these, you'll +!! have to change the Mwm*buttonBindings resource in Mwm to +!! ExplicitButtonBindings instead of DefaultButtonBindings. +!! +!!Buttons ExplicitButtonBindings +!!{ +!! <Btn3Down> frame|icon f.post_wmenu +!! <Btn1Up> icon f.restore +!! Alt<Btn1Down> window|icon f.lower +!! Alt<Btn2Down> window|icon f.resize +!! Alt<Btn3Down> window|icon f.move +!!} +!! +!! These are some example bindings that you might use if your +!! keyboardFocusPolicy is "pointer". Note that to use these, you'll +!! have to change the Mwm*buttonBindings resource in Mwm to +!! PointerButtonBindings instead of DefaultButtonBindings. !! +!!Buttons PointerButtonBindings +!!{ +!! <Btn1Down> frame|icon f.raise +!! <Btn3Down> frame|icon f.post_wmenu +!! <Btn3Down> root f.menu DefaultRootMenu +!! <Btn1Down> window f.raise +!! <Btn1Up> icon f.restore +!! Alt<Btn1Down> window|icon f.lower +!! Alt<Btn2Down> window|icon f.resize +!! Alt<Btn3Down> window|icon f.move +!!} diff --git a/x11-libs/motif-config/motif-config-0.9.ebuild b/x11-libs/motif-config/motif-config-0.9.ebuild new file mode 100644 index 000000000000..b9b7a6a4a487 --- /dev/null +++ b/x11-libs/motif-config/motif-config-0.9.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif-config/motif-config-0.9.ebuild,v 1.1 2005/04/26 13:56:50 lanius Exp $ + +inherit multilib + +DESCRIPTION="Utility to change the default Motif library" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86" +IUSE="" + +DEPEND="!<x11-libs/openmotif-2.1.30-r13 +!=x11-libs/openmotif-2.2.2* +!=x11-libs/openmotif-2.2.3 +!=x11-libs/openmotif-2.2.3-r1 +!=x11-libs/openmotif-2.2.3-r2 +!=x11-libs/openmotif-2.2.3-r3 +!=x11-libs/openmotif-2.2.3-r4 +!=x11-libs/openmotif-2.2.3-r5 +!=x11-libs/openmotif-2.2.3-r6 + +!<x11-libs/lesstif-0.93.94-r4 +!=x11-libs/lesstif-0.93.97 +!=x11-libs/lesstif-0.94.0*" + +RDEPEND="${DEPEND} + app-shells/bash" + +src_unpack(){ + einfo "nothing to unpack" +} + +src_compile() { + einfo "nothing to compile" +} + +src_install () { + exeinto /usr/bin + newexe ${FILESDIR}/${P} motif-config + dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config + + # for profile + dodir /usr/$(get_libdir)/motif + keepdir /usr/$(get_libdir)/motif + + # bitmaps + #dodir /usr/include/X11/bitmaps + #tar -xjf ${FILESDIR}/bitmaps.tbz2 -C ${D}/usr/include/X11/bitmaps + # bindings + #dodir /usr/$(get_libdir)/X11/bindings + #tar -xjf ${FILESDIR}/bindings.tbz2 -C ${D}/usr/$(get_libdir)/X11/bindings + + # mwm default config + insinto /etc/X11/app-defaults + doins ${FILESDIR}/Mwm.defaults + + insinto /etc/X11/mwm + doins ${FILESDIR}/system.mwmrc + + dodir /usr/$(get_libdir)/X11 + dosym /etc/X11/mwm /usr/$(get_libdir)/X11/mwm +} + +pkg_setup() { + # clean up cruft left over by old versions + has_version =x11-libs/openmotif-2.1.30* \ + || ( rm -f /usr/$(get_libdir)/motif/openmotif-2.1; \ + rm -fR /usr/include/openmotif-2.1; \ + rm -fR /usr/$(get_libdir)/openmotif-2.1 ) + has_version =x11-libs/openmotif-2.2.3* \ + || ( rm -f /usr/$(get_libdir)/motif/openmotif-2.2; \ + rm -fR /usr/include/openmotif-2.2; \ + rm -fR /usr/$(get_libdir)/openmotif-2.2 ) + has_version =x11-libs/lesstif-0.93.94* \ + || ( rm -f /usr/$(get_libdir)/motif/lesstif-1.2; \ + rm -fR /usr/include/lesstif-1.2; \ + rm -fR /usr/$(get_libdir)/lesstif-1.2 ) + has_version =x11-libs/lesstif-0.94* \ + || ( rm -f /usr/$(get_libdir)/motif/lesstif-2.1; \ + rm -fR /usr/include/lesstif-2.1; \ + rm -fR /usr/$(get_libdir)/openmotif-2.1 ) +} diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index 015eab02194c..733a3ba3c175 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/openmotif # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.105 2005/03/27 00:07:34 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.106 2005/04/26 13:56:43 lanius Exp $ + +*openmotif-2.2.3-r7 (26 Apr 2005) +*openmotif-2.1.30-r13 (26 Apr 2005) + + 26 Apr 2005; Heinrich Wendel <lanius@gentoo.org> + -openmotif-2.1.30-r12.ebuild, +openmotif-2.1.30-r13.ebuild, + -openmotif-2.2.3-r6.ebuild, +openmotif-2.2.3-r7.ebuild: + update to motif-config-0.9 27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> openmotif-2.1.30-r9.ebuild: diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest index 8533df0c9d37..0cef4b9293c3 100644 --- a/x11-libs/openmotif/Manifest +++ b/x11-libs/openmotif/Manifest @@ -1,18 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 cb051187dcf2784c408af37bdbefe815 openmotif-2.1.30-r12.ebuild 5310 MD5 820298e14c2fe7aa9d83621eb59a75ad openmotif-2.2.3-r3.ebuild 3239 MD5 18a738af27482c9abb5153e4227db96d openmotif-2.1.30-r6.ebuild 3861 MD5 adfb21d30974061a3fa839be7831ea77 openmotif-2.2.3.ebuild 3190 +MD5 bee52f32c8ad298f33bbe191441e9cd4 openmotif-2.2.3-r7.ebuild 3797 +MD5 15b023bfc27969a08a66f66ea4cc4b23 openmotif-2.1.30-r13.ebuild 5165 MD5 459687380ba71bba6e17cd677c6f9d60 openmotif-2.1.30-r7.ebuild 3986 MD5 24d889570bc059e0adfe8ab0b4df759d ChangeLog 15781 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253 -MD5 76dec0d25643ff7cf10bb114f60f4b43 openmotif-2.2.3-r6.ebuild 3947 MD5 223da65207cc5e34efb2119049d01097 openmotif-2.1.30-r9.ebuild 3985 MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r3 68 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r6 68 +MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r7 68 MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799 MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3 68 @@ -35,6 +33,7 @@ MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 3 MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471 MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r12 79 +MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r13 79 MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083 MD5 5c49a886f108baeda96fc41f32647cf6 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300 MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062 @@ -43,10 +42,3 @@ MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536 MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491 MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979 MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCZOovevY57Fted3ERAorQAJ0cqE7Zk7M5UFWjKkE7ECAg4Q38xACffK5x -TN6t1pOWExPZd0K6Oqmo7JM= -=DTPq ------END PGP SIGNATURE----- diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r12 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13 index ead704e865e9..ead704e865e9 100644 --- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r12 +++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13 diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r6 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7 index a6451299c75a..a6451299c75a 100644 --- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r6 +++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7 diff --git a/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild index 96c6def90920..57703e3d93f8 100644 --- a/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild +++ b/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild @@ -1,9 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild,v 1.5 2005/04/19 11:23:10 lanius Exp $ - -# disable sandbox, needed for motif-config -SANDBOX_DISABLED="1" +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild,v 1.1 2005/04/26 13:56:43 lanius Exp $ inherit eutils flag-o-matic multilib @@ -21,16 +18,13 @@ PROVIDE="virtual/motif" RDEPEND="virtual/libc virtual/x11 - >=x11-libs/motif-config-0.5" + >=x11-libs/motif-config-0.9" DEPEND="${RDEPEND} >=sys-apps/sed-4" SLOT="2.1" src_unpack() { - # profile stuff - motif-config --start-install - local cfg="${S}/config/cf/site.def" unpack ${A} @@ -163,18 +157,16 @@ src_install() { dodoc BUGREPORT OPENBUGS CLOSEDBUGS # profile stuff - motif-config --finish-install + dodir /etc/env.d + echo "LDPATH=/usr/lib/openmotif-2.1" > ${D}/etc/env.d/15openmotif-2.1 + dodir /usr/$(get_libdir)/motif + echo "PROFILE=openmotif-2.1" > ${D}/usr/$(get_libdir)/motif/openmotif-2.1 } -# Profile stuff -#pkg_setup() { -# if has_version =x11-libs/openmotif-2.1*; then touch /tmp/openmotif-2.1; fi -#} - pkg_postinst() { - motif-config --install openmotif-2.1 + /usr/bin/motif-config -s } -#pkg_prerm() { -# [ -f /tmp/openmotif-2.1 ] && rm -f /tmp/openmotif-2.1 || motif-config --uninstall openmotif-2.1 -#} +pkg_postrm() { + /usr/bin/motif-config -s +} diff --git a/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild index fe716d186b54..7d818fbd98a8 100644 --- a/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild +++ b/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild @@ -1,9 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild,v 1.5 2005/04/19 11:23:10 lanius Exp $ - -# disable sandbox, needed for motif-config -SANDBOX_DISABLED="1" +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild,v 1.1 2005/04/26 13:56:43 lanius Exp $ inherit eutils libtool flag-o-matic multilib @@ -22,10 +19,10 @@ DEPEND="virtual/libc >=sys-apps/sed-4 !ppc-macos? ( =sys-devel/automake-1.4* ) =sys-devel/autoconf-2.5* - >=x11-libs/motif-config-0.6" + >=x11-libs/motif-config-0.9" RDEPEND="virtual/libc virtual/x11 - >=x11-libs/motif-config-0.6" + >=x11-libs/motif-config-0.9" PROVIDE="virtual/motif" SLOT="2.2" @@ -33,15 +30,9 @@ SLOT="2.2" pkg_setup() { # multilib includes don't work right in this package... [ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}" - - # profile stuff - #if has_version =x11-libs/openmotif-2.2*; then touch /tmp/openmotif-2.2; fi } src_unpack() { - # profile stuff - motif-config --start-install - unpack ${A} cd ${S} @@ -136,15 +127,17 @@ src_install() { dodoc README RELEASE RELNOTES dodoc BUGREPORT TODO - # finish installation - motif-config --finish-install + # profile stuff + dodir /etc/env.d + echo "LDPATH=/usr/lib/openmotif-2.2" > ${D}/etc/env.d/15openmotif-2.2 + dodir /usr/$(get_libdir)/motif + echo "PROFILE=openmotif-2.2" > ${D}/usr/$(get_libdir)/motif/openmotif-2.2 } -# Profile stuff pkg_postinst() { - motif-config --install openmotif-2.2 + /usr/bin/motif-config -s } -#pkg_prerm() { -# [ -f /tmp/openmotif-2.2 ] && rm -f /tmp/openmotif-2.2 || motif-config --uninstall openmotif-2.2 -#} +pkg_postrm() { + /usr/bin/motif-config -s +} |