svn commit: r331384 - in head/comms/tkhylafax: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Oct 23 13:15:46 2013
New Revision: 331384
URL: http://svnweb.freebsd.org/changeset/ports/331384

Log:
  - Convert to USES+=tk
  - STAGE-clean

Modified:
  head/comms/tkhylafax/Makefile   (contents, props changed)
  head/comms/tkhylafax/files/patch-aa   (contents, props changed)
  head/comms/tkhylafax/pkg-plist   (contents, props changed)

Modified: head/comms/tkhylafax/Makefile
==============================================================================
--- head/comms/tkhylafax/Makefile	Wed Oct 23 13:08:41 2013	(r331383)
+++ head/comms/tkhylafax/Makefile	Wed Oct 23 13:15:46 2013	(r331384)
@@ -15,10 +15,9 @@ RUN_DEPENDS=	sendfax:${PORTSDIR}/comms/h
 		gv:${PORTSDIR}/print/gv
 
 USE_GHOSTSCRIPT_RUN=	yes
-USE_TK_RUN=	84
+USES+=		tk:run
 
 WRKSRC=		${WRKDIR}/tkhylafax
-MAN1=		tkhylafax.1
+MAKE_ARGS=	STAGEDIR=${STAGEDIR} PREFIX=${STAGEDIR}${PREFIX} TCLSH=${TCLSH} WISH=${WISH}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/comms/tkhylafax/files/patch-aa
==============================================================================
--- head/comms/tkhylafax/files/patch-aa	Wed Oct 23 13:08:41 2013	(r331383)
+++ head/comms/tkhylafax/files/patch-aa	Wed Oct 23 13:15:46 2013	(r331384)
@@ -1,11 +1,11 @@
---- Makefile.orig	Sat Mar 14 11:57:48 1998
-+++ Makefile	Mon Apr 21 02:56:19 2003
+--- Makefile.orig	1998-03-14 20:57:48.000000000 +0100
++++ Makefile	2013-10-23 15:12:54.000000000 +0200
 @@ -5,7 +5,7 @@
  
  ### EDIT THE NEXT LINES ONLY ###
  
 -PREFIX = /usr/local
-+#PREFIX = ${PREFIX}
++#PREFIX = /usr/local
  
  # The directory where the tkhylafax library will be installed
  TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
@@ -14,11 +14,11 @@
  
  # The full path to tclsh
 -TCLSH = /usr/bin/tclsh
-+TCLSH = tclsh8.4
++#TCLSH = /usr/bin/tclsh
  
  # The full path to wish.
 -WISH = /usr/bin/wish
-+WISH = wish8.4
++#WISH = /usr/bin/wish
  
  # The full path to your postscript viewer
 -GHOSTVIEW = /usr/X11/bin/gv
@@ -26,7 +26,7 @@
  
  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
  
-@@ -52,7 +52,6 @@
+@@ -52,11 +52,10 @@
  
  all:
  	$(MAKE) build
@@ -34,7 +34,12 @@
  
  build: Makefile
  	@echo "Patching tkhylafax..."
-@@ -66,24 +65,24 @@
+-	sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST)|g' \
++	sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST:S/${STAGEDIR}//)|g' \
+  	    -e 's|XXX_WISH_XXX|$(WISH)|g' \
+ 	    -e 's|XXX_GHOSTVIEW_XXX|$(GHOSTVIEW)|g' \
+ 	    tkhylafax.unpatched > $(TCLPRG_FILE)
+@@ -66,27 +65,28 @@
  
  $(TCLLIB_DEST):
  	if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi
@@ -63,3 +68,7 @@
  	@echo "Done" 
  
  install.man:
++	if [ ! -d $(TCLMAN_DEST) ]; then mkdir -p $(TCLMAN_DEST); fi
+ 	cp $(TCLMAN_FILE).man $(TCLMAN_DEST)/$(TCLMAN_FILE).1
+ 
+ clean:

Modified: head/comms/tkhylafax/pkg-plist
==============================================================================
--- head/comms/tkhylafax/pkg-plist	Wed Oct 23 13:08:41 2013	(r331383)
+++ head/comms/tkhylafax/pkg-plist	Wed Oct 23 13:15:46 2013	(r331384)
@@ -18,4 +18,5 @@ lib/tkhylafax-3.2/tclIndex
 lib/tkhylafax-3.2/tkhylafax.xbm
 lib/tkhylafax-3.2/dn.xbm
 lib/tkhylafax-3.2/up.xbm
+man/man1/tkhylafax.1.gz
 @dirrm lib/tkhylafax-3.2