Attachment #76605 for bug #110395

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





PORTNAME=	tk
PORTVERSION=	8.5.a.5
PORTREVISION=	3
CATEGORIES=	x11-toolkits
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	tcl

MAINTAINER=	martin@matuska.org
COMMENT=	Graphical toolkit for TCL

USE_TCL=	85
USE_TCL_BUILD=	85

LATEST_LINK?=	tk85
USE_XLIB=	yes
USE_LDCONFIG=	yes

GNU_CONFIGURE=	yes
TK_VER=		8.5
SHORT_TK_VER=	85
CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tk${TK_VER}
		--includedir=${PREFIX}/include/tk${TK_VER}
CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
PKGINSTALL=	${PKGDIR}/pkg-install.wish
PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
MANCOMPRESSED=	no
DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
SUB_FILES=	pkgIndex.tcl

.if !defined(BUILDING_TK_THREADS)
USE_TCL=	${SHORT_TK_VER}
USE_TCL_BUILD=	${SHORT_TK_VER}

OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
		WISH_WRAPPER "Require wish wrapper from ports" off
.else
USE_TK=		${SHORT_TK_VER}
PLIST=		${PKGDIR}/pkg-plist.threads
THREADS_SUFFIX=	-threads
LIB_DEPENDS=	tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread
.endif

SUB_LIST+=	THREADS_SUFFIX="${THREADS_SUFFIX}"

.include <bsd.port.pre.mk>
_TCL_IS_THREADED!=	${ECHO_CMD}	'puts [array names tcl_platform	-exact threaded]' | ${TCLSH} || return 0
. if !defined(TCL_WITH_THREADS) && !defined(WITH_THREADS) && !empty(_TCL_IS_THREADED)
TCL_WITH_THREADS=	yes
. endif
.endif

.if defined(BUILDING_TK_THREADS)
CONFIGURE_ARGS+=	--enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
			ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
LATEST_LINK=		tk85${THREADS_SUFFIX}
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
THREADS_SUFFIX=		-threads
USE_TCL=		85-thread
USE_TCL_BUILD=		85-thread
CONFLICTS=		tk-8.5*
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
.else
CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
			ac_cv_path_tclsh="${TCLSH}"
.endif

.if defined(WITH_WISH_WRAPPER)
RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper


.endif

.endif	# defined(BUILDING_TK_THREADS)

TKBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}

pre-everything::
	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi

post-patch:
	@${REINPLACE_CMD} -e 's|@TK_SHARED_BUILD@|#@TK_SHARED_BUILD@|g' ${WRKSRC}/Makefile.in
.if defined(BUILDING_TK_THREADS)
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
		-e 's|-ltk$${TK_VERSION}|-ltk$${TK_VERSION}${THREADS_SUFFIX}|g' \
		-e 's/-ltk`echo $${TK_VERSION} | tr -d .`/-ltk`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
		-e 's|-ltkstub$${TK_VERSION}|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}|g' \
		-e 's/-ltkstub`echo $${TK_VERSION} | tr -d .`/-ltkstub`echo $${TK_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|libtk$${SHORT_TK_VER}|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}|g' \
		-e 's|$$(BIN_INSTALL_DIR)/wish$$(VERSION)|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}|g' \
		-e 's|tk$$(VERSION)/tkConfig.sh|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh|g' \
		-e 's|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)|${WRKDIR}|g' \
		-e 's|$$(MINOR_VERSION)$$(TCLPATCHL)|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}|g' \
		${WRKSRC}/Makefile.in
.endif

post-configure:
	${REINPLACE_CMD} \
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
		${WRKSRC}/tkConfig.sh

.if defined(BUILDING_TK_THREADS)
do-install:
	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
	@${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}
	@${LN} -s ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \
		${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh
.endif

post-install:
	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
.if !defined(BUILDING_TK_THREADS) && !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
	${MKDIR} ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
. for mp in ${MAN1} ${MAN3} ${MANN}

Lines 1-3 Link Here

(-)x11-toolkits/tk85/files/pkgIndex.tcl (-3 lines)
1	# Tcl package index file, version 1.0
2
3	package ifneeded Tk 8.5 [list load "[file join [file dirname $dir] libtk85.so.1]" Tk]

Line 0 Link Here

(-)x11-toolkits/tk85/files/pkgIndex.tcl.in (+3 lines)
	1	# Tcl package index file, version 1.0
	2
	3	package ifneeded Tk%%THREADS_SUFFIX%% 8.5 [list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]

Line 0 Link Here

(-)x11-toolkits/tk85/pkg-plist.threads (+9 lines)
	1	bin/wish%%TK_VER%%-threads
	2	lib/libtk%%SHORT_TK_VER%%-threads.a
	3	lib/libtk%%SHORT_TK_VER%%-threads.so
	4	lib/libtk%%SHORT_TK_VER%%-threads.so.1
	5	lib/libtkstub%%SHORT_TK_VER%%-threads.a
	6	lib/tk%%TK_VER%%/tkConfig-threads.sh
	7	lib/tk%%TK_VER%%-threads/tkConfig.sh
	8	lib/tk%%TK_VER%%-threads/pkgIndex.tcl
	9	@dirrm lib/tk%%TK_VER%%-threads

Lines 5-11 Link Here

(-)x11-toolkits/tk85-thread/Makefile (-1 / +1 lines)
5	# $FreeBSD: ports/x11-toolkits/tk85-thread/Makefile,v 1.1 2007/03/13 08:46:43 miwi Exp $	5	# $FreeBSD: ports/x11-toolkits/tk85-thread/Makefile,v 1.1 2007/03/13 08:46:43 miwi Exp $
6	#	6	#
7		7
8	WITH_THREADS= yes	8	BUILDING_TK_THREADS= yes
9		9
10	MASTERDIR= ${.CURDIR}/../tk85	10	MASTERDIR= ${.CURDIR}/../tk85

Return to bug 110395

Lines 7-13 Link Here

(-)x11-toolkits/tk85/Makefile (-32 / +49 lines)
7		7
8	PORTNAME= tk	8	PORTNAME= tk
9	PORTVERSION= 8.5.a.5	9	PORTVERSION= 8.5.a.5
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= x11-toolkits	11	CATEGORIES= x11-toolkits
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= tcl	13	MASTER_SITE_SUBDIR= tcl
Lines 17-25 Link Here
17	MAINTAINER= martin@matuska.org	17	MAINTAINER= martin@matuska.org
18	COMMENT= Graphical toolkit for TCL	18	COMMENT= Graphical toolkit for TCL
19		19
20	USE_TCL= 85
21	USE_TCL_BUILD= 85
22
23	LATEST_LINK?= tk85	20	LATEST_LINK?= tk85
24	USE_XLIB= yes	21	USE_XLIB= yes
25	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
Lines 27-70 Link Here
27	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
28	TK_VER= 8.5	25	TK_VER= 8.5
29	SHORT_TK_VER= 85	26	SHORT_TK_VER= 85
30	CONFIGURE_ARGS= --enable-shared --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \	27	CONFIGURE_ARGS= --enable-shared --includedir=${PREFIX}/include/tk${TK_VER}
31	--includedir=${PREFIX}/include/tk${TK_VER}
32	CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1	28	CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
33	MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}	29	MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
34	PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}	30	PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
35	PKGINSTALL= ${PKGDIR}/pkg-install.wish
36	PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish
37	NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken	31	NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
38	MANCOMPRESSED= no	32	MANCOMPRESSED= no
39	DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}	33	DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}
		34	SUB_FILES= pkgIndex.tcl
		35
		36	.if !defined(BUILDING_TK_THREADS)
		37	USE_TCL= ${SHORT_TK_VER}
		38	USE_TCL_BUILD= ${SHORT_TK_VER}
40		39
41	OPTIONS= TK85_MAN "Install tk 8.5 manpages" off \	40	OPTIONS= TK85_MAN "Install tk 8.5 manpages" off \
42	WISH_WRAPPER "Require wish wrapper from ports" off	41	WISH_WRAPPER "Require wish wrapper from ports" off
		42	.else
		43	USE_TK= ${SHORT_TK_VER}
		44	PLIST= ${PKGDIR}/pkg-plist.threads
		45	THREADS_SUFFIX= -threads
		46	LIB_DEPENDS= tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread
		47	.endif
43		48
44	.include <bsd.port.pre.mk>	49	SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}"
45		50
46	.if exists(${TCLSH})	51	.include <bsd.port.pre.mk>
47	_TCL_IS_THREADED!= ${ECHO_CMD} 'puts [array names tcl_platform -exact threaded]' \| ${TCLSH} \|\| return 0
48	. if !defined(TCL_WITH_THREADS) && !defined(WITH_THREADS) && !empty(_TCL_IS_THREADED)
49	TCL_WITH_THREADS= yes
50	. endif
51	.endif
52		52
53	.if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)	53	.if defined(BUILDING_TK_THREADS)
54	. if defined(_TCL_IS_THREADED) && empty(_TCL_IS_THREADED)	54	CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
55	IGNORE= tcl with threads is required. Please install tcl with WITH_THREADS defined or from lang/tcl${USE_TCL} port and try again	55	CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
56	. endif	56	ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
57	CONFIGURE_ARGS+= --enable-threads	57	LATEST_LINK= tk85${THREADS_SUFFIX}
58	CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
59	THREADS_SUFFIX= -threads
60	USE_TCL= 85-thread
61	USE_TCL_BUILD= 85-thread
62	CONFLICTS= tk-8.5*
63	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
64	.else	58	.else
65	CONFIGURE_ARGS+= --disable-threads	59	CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
66	CONFLICTS= tk-threads-8.5*	60	ac_cv_path_tclsh="${TCLSH}"
67	.endif
68		61
69	.if defined(WITH_WISH_WRAPPER)	62	.if defined(WITH_WISH_WRAPPER)
70	RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper	63	RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper
Lines 389-411 Link Here
389		382
390	.endif	383	.endif
391		384
		385	.endif # defined(BUILDING_TK_THREADS)
		386
392	TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}	387	TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
393		388
394	pre-everything::	389	pre-everything::
395	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi	390	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
396		391
397	pre-configure:	392	post-patch:
		393	@${REINPLACE_CMD} -e 's\|@TK_SHARED_BUILD@\|#@TK_SHARED_BUILD@\|g' ${WRKSRC}/Makefile.in
		394	.if defined(BUILDING_TK_THREADS)
398	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \	395	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
		396	-e 's\|$${TCL_TRIM_DOTS}\|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}\|g' \
		397	-e 's\|-ltk$${TK_VERSION}\|-ltk$${TK_VERSION}${THREADS_SUFFIX}\|g' \
		398	-e 's/-ltk`echo $${TK_VERSION} \| tr -d .`/-ltk`echo $${TK_VERSION} \| tr -d .`${THREADS_SUFFIX}/g' \
		399	-e 's\|-ltkstub$${TK_VERSION}\|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}\|g' \
		400	-e 's/-ltkstub`echo $${TK_VERSION} \| tr -d .`/-ltkstub`echo $${TK_VERSION} \| tr -d .`${THREADS_SUFFIX}/g' \
399	${WRKSRC}/configure	401	${WRKSRC}/configure
		402	@${REINPLACE_CMD} -e 's\|libtk$${SHORT_TK_VER}\|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}\|g' \
		403	-e 's\|$$(BIN_INSTALL_DIR)/wish$$(VERSION)\|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}\|g' \
		404	-e 's\|tk$$(VERSION)/tkConfig.sh\|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh\|g' \
		405	-e 's\|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)\|${WRKDIR}\|g' \
		406	-e 's\|$$(MINOR_VERSION)$$(TCLPATCHL)\|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}\|g' \
		407	${WRKSRC}/Makefile.in
		408	.endif
400		409
401	post-configure:	410	post-configure:
402	${REINPLACE_CMD} \	411	${REINPLACE_CMD} \
403	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TKBASE}\|' \	412	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TKBASE}\|' \
404	${WRKSRC}/tkConfig.sh	413	${WRKSRC}/tkConfig.sh
405		414
		415	.if defined(BUILDING_TK_THREADS)
		416	do-install:
		417	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
		418	@${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}
		419	@${LN} -s ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \
		420	${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh
		421	.endif
		422
406	post-install:	423	post-install:
407	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/	424	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
408	.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)	425	.if !defined(BUILDING_TK_THREADS) && !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
409	${MKDIR} ${DATADIR}	426	${MKDIR} ${DATADIR}
410	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}	427	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
411	. for mp in ${MAN1} ${MAN3} ${MANN}	428	. for mp in ${MAN1} ${MAN3} ${MANN}