kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the runtime when anyone has symlink of /usr/X11R6. The script will finding

Browse source 
two tovid then not allow users to run it. Bump the PORTREVISION.

$ tovid
Found 2 installations of tovid on your system!
I won't run until there is only one of me :)
Installed versions:
   /usr/local/bin/tovid
   /usr/X11R6/bin/tovid
Exiting...

Reported by:	Andy Fawcett <andy@athame.co.uk>
This commit is contained in:
Jeremy Messenger 2007-08-12 15:58:36 +00:00
parent a689aeac0f
commit eae540764e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=197531
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/tovid/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= tovid
PORTVERSION= 0.30
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= multimedia python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tovid

35
multimedia/tovid/files/patch-src_tovid-init.in Normal file
View file

@ -0,0 +1,35 @@
--- src/tovid-init.in.orig 2007-08-12 10:09:50.000000000 -0500
+++ src/tovid-init.in 2007-08-12 10:10:37.000000000 -0500
@@ -386,32 +386,6 @@
# ******************************************************************************
-# Find multiple version kludge
-# ******************************************************************************
-INSTALLED_TOVIDS=$(type -a tovid 2>>/dev/null | awk '{print $NF}' | tr '\n' ' ')
-NUM_INSTALLED=0
-
-# Only count non-links
-for tovid in $INSTALLED_TOVIDS; do
- if ! test -L $tovid; then
- let "NUM_INSTALLED=NUM_INSTALLED+1"
- fi
-done
-
-# Exit when there is more than one tovid installed
-if test $NUM_INSTALLED -ne 1; then
- echo "Found $NUM_INSTALLED installations of tovid on your system!"
- echo "I won't run until there is only one of me :)"
- echo "Installed versions:"
- for version in $INSTALLED_TOVIDS; do
- echo " $version"
- done
- echo "Exiting..."
- exit 1
-fi
-
-
-# ******************************************************************************
# tovid home setup
# ******************************************************************************