From dsh@vlink.ru  Sun Oct 14 16:58:11 2007
Return-Path: <dsh@vlink.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52E7716A419
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Oct 2007 16:58:11 +0000 (UTC)
	(envelope-from dsh@vlink.ru)
Received: from sagitta.internal.vlink.ru (alias.rigel.internal.vlink.ru [85.172.168.14])
	by mx1.freebsd.org (Postfix) with ESMTP id DC6B513C46E
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Oct 2007 16:58:10 +0000 (UTC)
	(envelope-from dsh@vlink.ru)
Received: from sagitta.internal.vlink.ru (localhost [127.0.0.1])
	by sagitta.internal.vlink.ru (Postfix) with ESMTP id 4DE571F4581;
	Sun, 14 Oct 2007 20:58:09 +0400 (MSD)
Received: from localhost.my.domain (wizard.vlink.ru [85.172.168.67])
	by sagitta.internal.vlink.ru (Postfix) with ESMTPS id DA67F1F453D;
	Sun, 14 Oct 2007 20:58:08 +0400 (MSD)
Received: from localhost.my.domain (localhost [127.0.0.1])
	by localhost.my.domain (8.14.1/8.14.1) with ESMTP id l9EGw5KY020103;
	Sun, 14 Oct 2007 20:58:05 +0400 (MSD)
	(envelope-from dsh@localhost.my.domain)
Received: (from dsh@localhost)
	by localhost.my.domain (8.14.1/8.14.1/Submit) id l9EGw28s020096;
	Sun, 14 Oct 2007 20:58:03 +0400 (MSD)
	(envelope-from dsh)
Message-Id: <200710141658.l9EGw28s020096@localhost.my.domain>
Date: Sun, 14 Oct 2007 20:58:03 +0400 (MSD)
From: Denis Shaposhnikov <dsh@vlink.ru>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [MAINTAINER] x11/tkXwin: [fix install]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117187
>Category:       ports
>Synopsis:       [MAINTAINER] x11/tkXwin: [fix install]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 14 17:00:03 UTC 2007
>Closed-Date:    Wed Oct 17 14:07:37 UTC 2007
>Last-Modified:  Wed Oct 17 14:10:03 UTC 2007
>Originator:     Denis Shaposhnikov
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD localhost.my.domain 6.2-STABLE FreeBSD 6.2-STABLE #1: Mon Oct  1 18:16:29 MSD
>Description:
This patch fixes broken install.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- tkXwin-1.0_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/tkXwin/Makefile /var/tmp/dsh/download/tkXwin/Makefile
--- /usr/ports/x11/tkXwin/Makefile	2007-05-20 00:27:23.000000000 +0400
+++ /var/tmp/dsh/download/tkXwin/Makefile	2007-10-14 20:48:11.793563000 +0400
@@ -16,20 +16,15 @@
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Tcl/Tk library to detect idle periods of an X session
 
-LIB_DEPENDS=	tcl${SHORT_TK_VER}:${PORTSDIR}/lang/tcl${SHORT_TK_VER} \
-		tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
-
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
+USE_TK=		84+
 
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
-		--with-tkinclude=${LOCALBASE}/include/tk${TK_VER}
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR} \
+		--with-tk=${TK_LIBDIR} \
+		--with-tkinclude=${TK_INCLUDEDIR}
 CONFIGURE_ENV=	INSTALL="${INSTALL_DATA}"
 
-TK_VER=		8.4
-SHORT_TK_VER=	${TK_VER:S/.//}
-
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/x11/tkXwin/files/patch-configure /var/tmp/dsh/download/tkXwin/files/patch-configure
--- /usr/ports/x11/tkXwin/files/patch-configure	2005-08-31 16:00:30.000000000 +0400
+++ /var/tmp/dsh/download/tkXwin/files/patch-configure	2007-10-14 20:48:11.793563000 +0400
@@ -1,5 +1,5 @@
---- configure.orig	Tue Aug 30 14:52:03 2005
-+++ configure	Tue Aug 30 14:52:18 2005
+--- configure.orig	2002-08-25 10:29:53.000000000 +0400
++++ configure	2007-10-14 20:44:46.000000000 +0400
 @@ -1798,7 +1798,7 @@
  AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
  objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -9,3 +9,12 @@
  $libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
+@@ -3534,7 +3534,7 @@
+     
+ 
+ 
+-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
++PKG_TCL=${TCL_PREFIX}/lib/tkXwin
+ 
+ 
+ 
diff -ruN --exclude=CVS /usr/ports/x11/tkXwin/pkg-plist /var/tmp/dsh/download/tkXwin/pkg-plist
--- /usr/ports/x11/tkXwin/pkg-plist	2006-02-23 13:39:59.000000000 +0300
+++ /var/tmp/dsh/download/tkXwin/pkg-plist	2007-10-14 20:55:26.732098000 +0400
@@ -1,7 +1,6 @@
 lib/libtkXwin.la
 lib/libtkXwin.so
 lib/libtkXwin.so.1
-@cd %%LOCALBASE%%
 lib/tkXwin/pkgIndex.tcl
 lib/tkXwin/test.tcl
 @dirrm lib/tkXwin
--- tkXwin-1.0_2.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Oct 17 14:07:36 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117187 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117187: commit references a PR
Date: Wed, 17 Oct 2007 14:07:31 +0000 (UTC)

 miwi        2007-10-17 14:07:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11/tkXwin           Makefile pkg-plist 
     x11/tkXwin/files     patch-configure 
   Log:
   - Fix build after tk/tcl update
   
   PR:             117187
   Submitted by:   Denis Shaposhnikov <dsh@vlink.ru> (maintainer)
   
   Revision  Changes    Path
   1.7       +5 -10     ports/x11/tkXwin/Makefile
   1.2       +11 -2     ports/x11/tkXwin/files/patch-configure
   1.3       +0 -1      ports/x11/tkXwin/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
