[gentoo-commits] gentoo-x86 commit in app-misc/vittk/files: vittk-1.1.1-makefile.patch vittk-1.1.1-configure.patch vittk-1.1.1-dirs.patch

[Tim Harder (radhermit)]

radhermit    11/02/01 11:11:36

  Added:                vittk-1.1.1-makefile.patch
                        vittk-1.1.1-configure.patch vittk-1.1.1-dirs.patch
  Log:
  Initial import.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/vittk/files/vittk-1.1.1-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/vittk/files/vittk-1.1.1-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/vittk/files/vittk-1.1.1-makefile.patch?rev=1.1&content-type=text/plain

Index: vittk-1.1.1-makefile.patch
===================================================================
--- vittk-1.1.1/Makefile.in.orig
+++ vittk-1.1.1/Makefile.in
@@ -4,44 +4,44 @@
 
 INSTALL = ./install-sh
 
-.PHONY: usage insall autoconf release push dogfood
+.PHONY: usage install autoconf release push dogfood
 
 usage:
 	@echo "usage: make install"
 
 install:
-	@if [ ! -d @prefix@/bin ]; then \
-	  echo mkdir -p @prefix@/bin ; \
-	  mkdir -p @prefix@/bin ; \
+	@if [ ! -d $(DESTDIR)@prefix@/bin ]; then \
+	  echo mkdir -p $(DESTDIR)@prefix@/bin ; \
+	  mkdir -p $(DESTDIR)@prefix@/bin ; \
 	fi
-	@if [ ! -d @prefix@/share/doc/vittk ]; then \
-	  echo mkdir -p @prefix@/share/doc/vittk ; \
-	  mkdir -p @prefix@/share/doc/vittk ; \
+	@if [ ! -d $(DESTDIR)@docdir@ ]; then \
+	  echo mkdir -p $(DESTDIR)@docdir@ ; \
+	  mkdir -p $(DESTDIR)@docdir@ ; \
 	fi
-	@echo installing documentation in @prefix@/share/doc/vittk
-	@$(INSTALL) -c -m 644 Caveats @prefix@/share/doc/vittk/Caveats
-	@$(INSTALL) -c -m 644 Fonts @prefix@/share/doc/vittk/Fonts
-	@$(INSTALL) -c -m 644 README @prefix@/share/doc/vittk/README
-	@$(INSTALL) -c -m 644 Tutorial @prefix@/share/doc/vittk/Tutorial
-	@$(INSTALL) -c -m 644 WhatsNew @prefix@/share/doc/vittk/WhatsNew
-	@echo installing man page in @prefix@/man/man1
-	@if [ ! -d @prefix@/man/man1 ]; then \
-	  echo mkdir -p @prefix@/man/man1 ; \
-	  mkdir -p @prefix@/man/man1 ; \
+	@echo installing documentation in $(DESTDIR)@docdir@
+	@$(INSTALL) -c -m 644 Caveats $(DESTDIR)@docdir@/Caveats
+	@$(INSTALL) -c -m 644 Fonts $(DESTDIR)@docdir@/Fonts
+	@$(INSTALL) -c -m 644 README $(DESTDIR)@docdir@/README
+	@$(INSTALL) -c -m 644 Tutorial $(DESTDIR)@docdir@/Tutorial
+	@$(INSTALL) -c -m 644 WhatsNew $(DESTDIR)@docdir@/WhatsNew
+	@echo installing man page in $(DESTDIR)@mandir@/man1
+	@if [ ! -d $(DESTDIR)@mandir@/man1 ]; then \
+	  echo mkdir -p $(DESTDIR)@mandir@/man1 ; \
+	  mkdir -p $(DESTDIR)@mandir@/man1 ; \
 	fi
-	@$(INSTALL) -c -m 644 vittk.man @prefix@/man/man1/vittk.1
-	@echo installing vittkrc in @prefix@/etc
-	@$(INSTALL) -c -m 644 vittkrc @prefix@/etc/vittkrc
-	@if [ ! -d @prefix@/lib/vittk ]; then \
-	  echo mkdir -p @prefix@/lib/vittk ; \
-	  mkdir -p @prefix@/lib/vittk ; \
+	@$(INSTALL) -c -m 644 vittk.man $(DESTDIR)@mandir@/man1/vittk.1
+	@echo installing vittkrc in $(DESTDIR)@sysconfdir@
+	@$(INSTALL) -c -m 644 vittkrc $(DESTDIR)@sysconfdir@/vittkrc
+	@if [ ! -d $(DESTDIR)@libdir@/vittk ]; then \
+	  echo mkdir -p $(DESTDIR)@libdir@/vittk ; \
+	  mkdir -p $(DESTDIR)@libdir@/vittk ; \
 	fi
-	@echo installing .tcl files in @prefix@/lib/vittk
-	@cp *.tcl @prefix@/lib/vittk
-	@echo creating @prefix@/lib/vittk/tclIndex
-	@(cd @prefix@/lib/vittk; echo "auto_mkindex `pwd`; exit" | @WISH@)
-	@echo installing vittk in @prefix@/bin
-	@$(INSTALL) -c -m 755 vittk @prefix@/bin/vittk
+	@echo installing .tcl files in $(DESTDIR)@libdir@/vittk
+	@cp *.tcl $(DESTDIR)@libdir@/vittk
+	@echo creating $(DESTDIR)@libdir@/vittk/tclIndex
+	@(cd $(DESTDIR)@libdir@/vittk; echo "auto_mkindex `pwd`; exit" | @TCLSH@)
+	@echo installing vittk in $(DESTDIR)@prefix@/bin
+	@$(INSTALL) -c -m 755 vittk $(DESTDIR)@prefix@/bin/vittk
 
 autoconf:
 	@make -f .makefile autoconf
@@ -54,3 +54,4 @@
 dogfood:
 	@make -f .makefile dogfood
 
+check:



1.1                  app-misc/vittk/files/vittk-1.1.1-configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/vittk/files/vittk-1.1.1-configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/vittk/files/vittk-1.1.1-configure.patch?rev=1.1&content-type=text/plain

Index: vittk-1.1.1-configure.patch
===================================================================
--- vittk-1.1.1/configure.in.orig
+++ vittk-1.1.1/configure.in
@@ -14,11 +14,11 @@
 fi
 AC_SUBST(BASH)
 
-AC_PATH_PROG(WISH, wish, NOT_FOUND)
-if test "$WISH" = "NOT_FOUND"; then
+AC_PATH_PROG(TCLSH, tclsh, NOT_FOUND)
+if test "$TCLSH" = "NOT_FOUND"; then
   AC_MSG_ERROR([can not continue: wish not found])
 fi
-AC_SUBST(WISH)
+AC_SUBST(TCLSH)
 
 AC_PATH_PROG(TASK, task, NOT_FOUND)
 if test "$TASK" = "NOT_FOUND"; then
@@ -30,11 +30,3 @@
 AC_SUBST(FONT)
 
 AC_OUTPUT(vittk vittk.man Makefile)
-chmod 755 vittk
-
-echo creating ./tclIndex
-echo "auto_mkindex `pwd`; exit" | $WISH
-
-echo "./configure is done"
-echo "now do \"sudo make install\" or \"make install\""
-



1.1                  app-misc/vittk/files/vittk-1.1.1-dirs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/vittk/files/vittk-1.1.1-dirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/vittk/files/vittk-1.1.1-dirs.patch?rev=1.1&content-type=text/plain

Index: vittk-1.1.1-dirs.patch
===================================================================
--- vittk-1.1.1.orig/vittk.in
+++ vittk-1.1.1/vittk.in
@@ -17,7 +17,7 @@
 
 set font "@FONT@"
 set system_task_cmd "ls"
-set system_vittkrc "@prefix@/etc/vittkrc"
+set system_vittkrc "@sysconfdir@/vittkrc"
 set task "@TASK@"
 set ver "@VER@"
 
@@ -28,8 +28,8 @@
   source ./vars.tcl
   set auto_path ". $auto_path"
 } else { 
-  source @prefix@/lib/vittk/vars.tcl
-  set auto_path "@prefix@/lib/vittk $auto_path"
+  source @libdir@/vittk/vars.tcl
+  set auto_path "@libdir@/vittk $auto_path"
 }
 
 ReadRcs
--- vittk-1.1.1.orig/vittk.man.in
+++ vittk-1.1.1/vittk.man.in
@@ -89,13 +89,13 @@
 in Taskwarrior.  At this time, various other parts of the VITtk color
 scheme can only be changed system-wide by altering the variables in
 .br
-@prefix@/lib/vars.tcl.
+@libdir@/vars.tcl.
 .SH FONTS
 VITtk requires a fixed-width font for it's columns to align correctly.
 The default font "TkFixedFont" has been set to ensure this happens. You can
 use other Xwindows fonts by using the -fn option or your ~/.vittkrc file.
 Instructions for browsing fixed-width fonts can be found in the
-/usr/local/share/doc/vittk/Fonts file. If you specify a proportional font
+@docdir@/Fonts file. If you specify a proportional font
 (you will get a warning message and) the VITtk display will probably look very
 bad, and if you use the -fn option with the name of a non-existent font then
 VITtk will default the default tcl/tkfont (e.g. "fixed") without warning.
@@ -103,20 +103,20 @@
 fixed-width, so care should be taken to specify an existing font.
 .SH SETTINGS
 There are a number of settings which allow you to "remotely control"
-many aspects of VITtk.  Refer to the @prefix@/etc/vittkrc file for more 
+many aspects of VITtk.  Refer to the @sysconfdir@/vittkrc file for more 
 information.  There are also some settings which are hard-coded 
 (e.g. how long feedback messages are displayed.)  These could be
-changed sytem-wide by editing @prefix@/lib/vars.tcl.
+changed sytem-wide by editing @libdir@/vars.tcl.
 .SH FILES
-@prefix@/etc/vittkrc - the system-wide VITtk configuration file
+@sysconfdir@/vittkrc - the system-wide VITtk configuration file
 .br
 ~/.vittkrc - user VITtk configuration file
 .br
 /tmp/vittk-$USER.log - VITtk actions log
 .br
-@prefix@/share/doc/vittk/README - quick start and more information
+@docdir@/README - quick start and more information
 .br
-@prefix@/share/doc/vittk/Tutorial - a brief VITtk tutoral
+@docdir@/Tutorial - a brief VITtk tutoral
 .SH CREDITS & COPYRIGHT
 VITtk was written by Steve Rader (C) 2011.