Attachment #81880 for bug #117187

View | Details | Raw Unified | Return to bug 117187
Collapse All | Expand All




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=${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>




--- 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" \

 $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
 
 
 

Lines 1-7 Link Here

(-)/var/tmp/dsh/download/tkXwin/pkg-plist (-1 lines)
1	lib/libtkXwin.la	1	lib/libtkXwin.la
2	lib/libtkXwin.so	2	lib/libtkXwin.so
3	lib/libtkXwin.so.1	3	lib/libtkXwin.so.1
4	@cd %%LOCALBASE%%
5	lib/tkXwin/pkgIndex.tcl	4	lib/tkXwin/pkgIndex.tcl
6	lib/tkXwin/test.tcl	5	lib/tkXwin/test.tcl
7	@dirrm lib/tkXwin	6	@dirrm lib/tkXwin

Return to bug 117187

Lines 16-35 Link Here

(-)/var/tmp/dsh/download/tkXwin/Makefile (-10 / +5 lines)
16	MAINTAINER= dsh@vlink.ru	16	MAINTAINER= dsh@vlink.ru
17	COMMENT= Tcl/Tk library to detect idle periods of an X session	17	COMMENT= Tcl/Tk library to detect idle periods of an X session
18		18
19	LIB_DEPENDS= tcl${SHORT_TK_VER}:${PORTSDIR}/lang/tcl${SHORT_TK_VER} \
20	tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
21
22	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
23	USE_X_PREFIX= yes	20	USE_X_PREFIX= yes
24	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	USE_TK= 84+
25		23
26	CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \	24	CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \
27	--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \	25	--with-tclinclude=${TCL_INCLUDEDIR} \
28	--with-tk=${LOCALBASE}/lib/tk${TK_VER} \	26	--with-tk=${TK_LIBDIR} \
29	--with-tkinclude=${LOCALBASE}/include/tk${TK_VER}	27	--with-tkinclude=${TK_INCLUDEDIR}
30	CONFIGURE_ENV= INSTALL="${INSTALL_DATA}"	28	CONFIGURE_ENV= INSTALL="${INSTALL_DATA}"
31		29
32	TK_VER= 8.4
33	SHORT_TK_VER= ${TK_VER:S/.//}
34
35	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)/var/tmp/dsh/download/tkXwin/files/patch-configure (-2 / +11 lines)
1	--- configure.orig Tue Aug 30 14:52:03 2005	1	--- configure.orig 2002-08-25 10:29:53.000000000 +0400
2	+++ configure Tue Aug 30 14:52:18 2005	2	+++ configure 2007-10-14 20:44:46.000000000 +0400
3	@@ -1798,7 +1798,7 @@	3	@@ -1798,7 +1798,7 @@
4	AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \	4	AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
5	objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \	5	objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
Lines 9-11 Link Here
9	$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \	9	$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
10	\|\| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }	10	\|\| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
11		11
		12	@@ -3534,7 +3534,7 @@
		13
		14
		15
		16	-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
		17	+PKG_TCL=${TCL_PREFIX}/lib/tkXwin
		18
		19
		20