svn commit: r339212 - in branches/2014Q1/x11/tkXwin: . files

[Pietro Cerutti]

Author: gahr
Date: Thu Jan  9 09:09:41 2014
New Revision: 339212
URL: http://svnweb.freebsd.org/changeset/ports/339212

Log:
  MFH: r339205
  
  - Convert to USES=tk, and fix required Tk version
  - STAGE-clean
  - PREFIX-clean
  
  Approved by:    portmgr (mat)

Modified:
  branches/2014Q1/x11/tkXwin/Makefile   (contents, props changed)
  branches/2014Q1/x11/tkXwin/files/patch-Makefile.in   (contents, props changed)
  branches/2014Q1/x11/tkXwin/files/patch-configure   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/x11/tkXwin/Makefile
==============================================================================
--- branches/2014Q1/x11/tkXwin/Makefile	Thu Jan  9 08:59:44 2014	(r339211)
+++ branches/2014Q1/x11/tkXwin/Makefile	Thu Jan  9 09:09:41 2014	(r339212)
@@ -11,16 +11,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dsh at vlink.ru
 COMMENT=	Tcl/Tk library to detect idle periods of an X session
 
+USES=		tk:84
 GNU_CONFIGURE=	yes
 USE_XORG=	xt xscrnsaver
 USE_LDCONFIG=	yes
-USE_TK=		84+
 
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tk=${TK_LIBDIR} \
 		--with-tkinclude=${TK_INCLUDEDIR}
 CONFIGURE_ENV=	INSTALL="${INSTALL_DATA}"
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: branches/2014Q1/x11/tkXwin/files/patch-Makefile.in
==============================================================================
--- branches/2014Q1/x11/tkXwin/files/patch-Makefile.in	Thu Jan  9 08:59:44 2014	(r339211)
+++ branches/2014Q1/x11/tkXwin/files/patch-Makefile.in	Thu Jan  9 09:09:41 2014	(r339212)
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Aug 25 10:29:52 2002
-+++ Makefile.in	Tue Aug  9 15:09:49 2005
+--- Makefile.in.orig	2002-08-25 08:29:52.000000000 +0200
++++ Makefile.in	2014-01-09 09:33:06.000000000 +0100
 @@ -14,8 +14,8 @@
  # 
  
@@ -20,3 +20,22 @@
  
  common_sources = tkXwin.c
  
+@@ -432,14 +432,14 @@
+ 
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) @PKG_TCL@
++	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
+ 	echo	"package ifneeded tkXwin"				   \
+ 		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
+-		"[list load $(DESTDIR)$(libdir)/libtkXwin.so]"	   \
+-	    > @PKG_TCL@/pkgIndex.tcl
++		"[list load $(libdir)/libtkXwin.so]"	   \
++	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
+ 	sed -e 's%load .libs/libtkXwin.so%package require tkXwin%' \
+ 	    < test.tcl      					   \
+-	    > @PKG_TCL@/test.tcl
++	    > $(DESTDIR)@PKG_TCL@/test.tcl
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

Modified: branches/2014Q1/x11/tkXwin/files/patch-configure
==============================================================================
--- branches/2014Q1/x11/tkXwin/files/patch-configure	Thu Jan  9 08:59:44 2014	(r339211)
+++ branches/2014Q1/x11/tkXwin/files/patch-configure	Thu Jan  9 09:09:41 2014	(r339212)
@@ -1,5 +1,5 @@
---- configure.orig	2002-08-25 10:29:53.000000000 +0400
-+++ configure	2007-10-14 20:44:46.000000000 +0400
+--- configure.orig	2002-08-25 08:29:53.000000000 +0200
++++ configure	2014-01-09 09:46:12.000000000 +0100
 @@ -1798,7 +1798,7 @@
  AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
  objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -14,7 +14,7 @@
  
  
 -PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
-+PKG_TCL=${TCL_PREFIX}/lib/tkXwin
++PKG_TCL=$prefix/lib/tkXwin