/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.194 Revision 1.223
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.194 2005/08/09 22:40:39 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.223 2006/02/15 23:40:16 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 159 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
176 local x="" 164 local x=""
165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 167
178 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
179 then 169 then
180 local m="" 170 local m=""
181 for m in "$@" ; do 171 for m in "$@" ; do
282 272
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
285 do 275 do
286 # Generate some useful debug info ... 276 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 279
290 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 281 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 287
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 290
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 293
304 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 295 then
306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
307 then 297 then
311 count=5 301 count=5
312 break 302 break
313 fi 303 fi
314 fi 304 fi
315 305
316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
317 then 307 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 313
324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
325 316
326 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
327 then 318 then
328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo 320 echo
392 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
393 done 384 done
394 ${exe} "${tmp}" || ${exe} -p "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
395 echo "${tmp}" 386 echo "${tmp}"
396 else 387 else
397 [[ ${exe} == "touch" ]] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
398 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
399 || exe="-d" 395 || exe="-dt"
400 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
401 fi 398 fi
402} 399}
403 400
404# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
405# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
406# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
407# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
408# 405#
409# egetent(database, key) 406# egetent(database, key)
410egetent() { 407egetent() {
411 if [[ "${USERLAND}" == "Darwin" ]] ; then 408 case ${CHOST} in
409 *-darwin*)
412 case "$2" in 410 case "$2" in
413 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
414 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
415 ;; 413 ;;
416 *) # Numeric 414 *) # Numeric
417 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
418 ;; 416 ;;
419 esac 417 esac
420 elif [[ "${USERLAND}" == "BSD" ]] ; then 418 ;;
421 local action 419 *-freebsd*|*-dragonfly*)
422 if [ "$1" == "passwd" ] 420 local opts action="user"
423 then 421 [[ $1 == "passwd" ]] || action="group"
424 action="user" 422
425 else 423 # lookup by uid/gid
426 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
427 fi 426 fi
427
428 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
429 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
430 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
431 getent "$1" "$2" 435 getent "$1" "$2"
432 fi 436 ;;
437 esac
433} 438}
434 439
435# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
436# vapier@gentoo.org 441# vapier@gentoo.org
437# 442#
475 fi 480 fi
476 else 481 else
477 euid="next" 482 euid="next"
478 fi 483 fi
479 if [[ ${euid} == "next" ]] ; then 484 if [[ ${euid} == "next" ]] ; then
480 local pwrange 485 for euid in $(seq 101 999) ; do
481 if [[ ${USERLAND} == "BSD" ]] ; then
482 pwrange=$(jot 898 101)
483 else
484 pwrange=$(seq 101 999)
485 fi
486 for euid in ${pwrange} ; do
487 [[ -z $(egetent passwd ${euid}) ]] && break 486 [[ -z $(egetent passwd ${euid}) ]] && break
488 done 487 done
489 fi 488 fi
490 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
491 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
492 491
493 # handle shell 492 # handle shell
494 local eshell=$1; shift 493 local eshell=$1; shift
495 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
496 if [[ ! -e ${eshell} ]] ; then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
497 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
498 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
499 fi 498 fi
499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
500 eerror "Do not specify ${eshell} yourself, use -1"
501 die "Pass '-1' as the shell parameter"
502 fi
500 else 503 else
501 case ${USERLAND} in 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
502 Darwin) eshell="/usr/bin/false";; 505 [[ -x ${ROOT}${shell} ]] && break
503 BSD) eshell="/usr/sbin/nologin";; 506 done
504 *) eshell="/bin/false";; 507
505 esac 508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
511 fi
512
513 eshell=${shell}
506 fi 514 fi
507 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
508 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
509 517
510 # handle homedir 518 # handle homedir
547 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
548 556
549 # handle extra and add the user 557 # handle extra and add the user
550 local oldsandbox=${SANDBOX_ON} 558 local oldsandbox=${SANDBOX_ON}
551 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
552 case ${USERLAND} in 560 case ${CHOST} in
553 Darwin) 561 *-darwin*)
554 ### Make the user 562 ### Make the user
555 if [[ -z $@ ]] ; then 563 if [[ -z $@ ]] ; then
556 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
557 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
558 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
569 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
570 einfo "eextra: $@" 578 einfo "eextra: $@"
571 die "Required function missing" 579 die "Required function missing"
572 fi 580 fi
573 ;; 581 ;;
574 BSD) 582 *-freebsd*|*-dragonfly*)
575 if [[ -z $@ ]] ; then 583 if [[ -z $@ ]] ; then
576 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
577 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
578 die "enewuser failed" 586 die "enewuser failed"
579 else 587 else
580 einfo " - Extra: $@" 588 einfo " - Extra: $@"
581 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
582 "$@" || die "enewuser failed" 590 "$@" || die "enewuser failed"
583 fi 591 fi
584 ;; 592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd ${opts} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
603 *-openbsd*)
604 if [[ -z $@ ]] ; then
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} || die "enewuser failed"
608 else
609 einfo " - Extra: $@"
610 useradd -u ${euid} -s ${eshell} \
611 -d ${ehome} -c "Added by portage for ${PN}" \
612 -g ${egroups} ${euser} "$@" || die "enewuser failed"
613 fi
614 ;;
615
585 *) 616 *)
586 if [[ -z $@ ]] ; then 617 if [[ -z $@ ]] ; then
587 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
588 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
589 || die "enewuser failed" 620 || die "enewuser failed"
639 then 670 then
640 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
641 then 672 then
642 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
643 then 674 then
644 if [[ "${USERLAND}" == "Darwin" ]]; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
645 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
646 else 677 else
647 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
648 fi 679 fi
649 else 680 else
663 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
664 695
665 # add the group 696 # add the group
666 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
667 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
668 if [[ "${USERLAND}" == "Darwin" ]]; then 699 case ${CHOST} in
700 *-darwin*)
669 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
670 then 702 then
671 einfo "Extra options are not supported on Darwin/OS X yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
672 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
673 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
674 die "Required function missing" 706 die "Required function missing"
675 fi 707 fi
676 708
677 # If we need the next available 709 # If we need the next available
678 case ${egid} in 710 case ${egid} in
679 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
680 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
681 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
682 done 714 done
683 esac 715 esac
684 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
685 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
686 elif [[ "${USERLAND}" == "BSD" ]] ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
687 case ${egid} in 721 case ${egid} in
688 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
689 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
690 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
691 done 725 done
692 esac 726 esac
693 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
694 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
695 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
696 fi 742 ;;
743 esac
697 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
698} 745}
699 746
700# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
701# vapier@gentoo.org 748# vapier@gentoo.org
812 type="Network;${type}" 859 type="Network;${type}"
813 ;; 860 ;;
814 861
815 sci) 862 sci)
816 case ${catmin} in 863 case ${catmin} in
817 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
818 bio*) type=Biology;; 865 bio*) type=Biology;;
819 calc*) type=Calculator;; 866 calc*) type=Calculator;;
820 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
821 geo*) type=Geology;; 868 geo*) type=Geology;;
822 math*) type=Math;; 869 math*) type=Math;;
854Exec=${exec} 901Exec=${exec}
855Path=${path} 902Path=${path}
856Icon=${icon} 903Icon=${icon}
857Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
858 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
859 insinto /usr/share/applications 909 insinto /usr/share/applications
860 doins "${desktop}" 910 doins "${desktop}"
861 911 )
862 return 0
863} 912}
864 913
865# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
866# 915#
867# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
929############################################################## 978##############################################################
930 979
931 980
932# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
933find_unpackable_file() { 982find_unpackable_file() {
934 local src="$1" 983 local src=$1
935 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
936 then
937 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
938 else 986 else
939 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
940 then
941 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
942 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
943 then
944 src="${PWD}/${src}" 990 src=${PWD}/${src}
945 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
946 then
947 src="${src}" 992 src=${src}
948 fi
949 fi 993 fi
950 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
951 echo "${src}" 996 echo "${src}"
952} 997}
953 998
954# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
955# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
970# lseek 1015# lseek
971# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
972# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
973# thus we would pass in the value of '4' as the second parameter. 1018# thus we would pass in the value of '4' as the second parameter.
974unpack_pdv() { 1019unpack_pdv() {
975 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
976 local sizeoff_t="$2" 1021 local sizeoff_t=$2
977 1022
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'"
978 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
979 1025
980 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
981 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
982 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
983 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
984 1030
985 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1049# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1050# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1051# - If the offset is not specified then we will attempt to extract 1097# - If the offset is not specified then we will attempt to extract
1052# the proper offset from the script itself. 1098# the proper offset from the script itself.
1053unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1054 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1055 local skip="$2" 1102 local skip=$2
1056 local exe="$3" 1103 local exe=$3
1057 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1058 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1111 local skip=0
1064 exe=tail 1112 exe=tail
1065 case ${ver} in 1113 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1114 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1079 ;; 1127 ;;
1080 2.1.3) 1128 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1130 let skip="skip + 1"
1083 ;; 1131 ;;
1084 2.1.4) 1132 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1133 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1135 exe="dd"
1088 ;; 1136 ;;
1089 *) 1137 *)
1134check_license() { 1182check_license() {
1135 local lic=$1 1183 local lic=$1
1136 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1137 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1138 else 1186 else
1139 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1140 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1141 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1142 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1143 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1144 lic="${src}" 1192 lic="${lic}"
1145 fi
1146 fi 1193 fi
1194 fi
1147 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1148 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1149 1197
1150 # here is where we check for the licenses the user already 1198 # here is where we check for the licenses the user already
1151 # accepted ... if we don't find a match, we make the user accept 1199 # accepted ... if we don't find a match, we make the user accept
1152 local shopts=$- 1200 local shopts=$-
1208 # first we figure out how many cds we're dealing with by 1256 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1257 # the # of files they gave us
1210 local cdcnt=0 1258 local cdcnt=0
1211 local f= 1259 local f=
1212 for f in "$@" ; do 1260 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1263 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1218 1266
1219 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1268 # if they did, let's just believe them that it's correct
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1270 local var=
1229 cdcnt=0 1271 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1279 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1281 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1282 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 export CDROM_SET=-1
1286 for f in ${CDROM_CHECK_1//:/ } ; do
1287 ((++CDROM_SET))
1288 [[ -e ${CD_ROOT}/${f} ]] && break
1289 done
1290 export CDROM_MATCH=${f}
1243 return 1291 return
1244 fi 1292 fi
1245 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1297 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1298 echo
1254 einfo "If you do not have the CD, but have the data files" 1299 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1302 einfo "directory containing the files."
1261 echo 1306 echo
1262 else 1307 else
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1309 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1314 done
1270 echo 1315 echo
1271 einfo "If you do not have the CDs, but have the data files" 1316 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1274 einfon "" 1319 einfon ""
1275 cdcnt=0 1320 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1279 done 1324 done
1280 echo 1325 echo
1281 einfo "Or, if you have all the files in the same place, or" 1326 einfo "Or, if you have all the files in the same place, or"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1330 echo
1286 einfo "For example:" 1331 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1333 echo
1289 fi 1334 fi
1335
1336 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1338 cdrom_load_next_cd
1292} 1339}
1293 1340
1294# this is only used when you need access to more than one cd. 1341# this is only used when you need access to more than one cd.
1295# when you have finished using the first cd, just call this function. 1342# when you have finished using the first cd, just call this function.
1296# when it returns, CDROM_ROOT will be pointing to the second cd. 1343# when it returns, CDROM_ROOT will be pointing to the second cd.
1297# remember, you can only go forward in the cd chain, you can't go back. 1344# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1346 local var
1301 1347 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1348
1307 unset CDROM_ROOT 1349 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1312 else 1355 else
1313 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1314 fi 1357 fi
1315 1358
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# all it does is try to locate a give file on a cd ... if the cd isn't 1364# all it does is try to locate a give file on a cd ... if the cd isn't
1322# found, then a message asking for the user to insert the cdrom will be 1365# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1373 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1374 local i=0
1375 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then
1377 cdset=(${cdset[${CDROM_SET}]})
1378 fi
1379
1380 while [[ -n ${cdset[${i}]} ]] ; do
1381 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1382 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1383
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1334 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && export CDROM_ROOT=${mline} 1387 export CDROM_ROOT=${mline}
1388 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]}
1390 return
1391 fi
1392 done
1393
1394 ((++i))
1337 done 1395 done
1338 1396
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1397 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1402 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1404 fi
1356 showedmsg=1 1405 else
1406 if [[ -z ${CDROM_NAME_1} ]] ; then
1407 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1408 else
1409 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1410 einfo "Please insert+mount the ${!var} cdrom now !"
1411 fi
1357 fi 1412 fi
1413 showedmsg=1
1414 fi
1358 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1417 echo
1361 einfo "If you are having trouble with the detection" 1418 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1419 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1420 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1422 read || die "something is screwed with your system"
1366 fi
1367 done 1423 done
1368} 1424}
1369 1425
1370# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1371# a package can support 1427# a package can support
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1576
1521 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1522 shift 1578 shift
1523 1579
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1580 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1581
1582 # if the USE file doesnt exist, assume the $PKG is either
1583 # injected or package.provided
1525 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1526 1585
1527 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1642# $5 == path for wrapper
1584make_wrapper() { 1643make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1645 local tmpwrapper=$(emktemp)
1646 # We don't want to quote ${bin} so that people can pass complex
1647 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1648 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1649#!/bin/sh
1589cd "${chdir}" 1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1654 else
1655 export LD_LIBRARY_PATH="${libdir}"
1656 fi
1657fi
1591exec ${bin} "\$@" 1658exec ${bin} "\$@"
1592EOF 1659EOF
1593 chmod go+rx "${tmpwrapper}" 1660 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1661 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1662 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1663 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1664 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1665 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1666 fi
1601} 1667}

Legend:
Removed from v.1.194  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20