Attachment #76610 for bug #110402

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

Lines 7-13 Link Here

(-)x11-toolkits/tk84/Makefile (-18 / +48 lines)
7		7
8	PORTNAME= tk	8	PORTNAME= tk
9	PORTVERSION= 8.4.14	9	PORTVERSION= 8.4.14
10	PORTREVISION= 2	10	PORTREVISION= 3
11	PORTEPOCH= 2	11	PORTEPOCH= 2
12	CATEGORIES= x11-toolkits tk84	12	CATEGORIES= x11-toolkits tk84
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 18-26 Link Here
18	MAINTAINER= martin@matuska.org	18	MAINTAINER= martin@matuska.org
19	COMMENT= Graphical toolkit for TCL	19	COMMENT= Graphical toolkit for TCL
20		20
21	USE_TCL= 84
22	USE_TCL_BUILD= 84
23
24	LATEST_LINK?= tk84	21	LATEST_LINK?= tk84
25	USE_XLIB= yes	22	USE_XLIB= yes
26	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
Lines 36-59 Link Here
36	NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken	33	NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken
37	MANCOMPRESSED= no	34	MANCOMPRESSED= no
38	DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}	35	DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER}
		36	SUB_FILES= pkgIndex.tcl
		37
		38	.if !defined(BUILDING_TK_THREADS)
		39	USE_TCL= 84
		40	USE_TCL_BUILD= 84
39		41
40	OPTIONS= TK84_MAN "Install tk 8.4 manpages" on \	42	OPTIONS= TK84_MAN "Install tk 8.4 manpages" on \
41	WISH_WRAPPER "Require wish wrapper from ports" off	43	WISH_WRAPPER "Require wish wrapper from ports" off
		44	.else
		45	USE_TK= ${SHORT_TK_VER}
		46	PLIST= ${PKGDIR}/pkg-plist.threads
		47	THREADS_SUFFIX= -threads
		48	LIB_DEPENDS= tcl${SHORT_TK_VER}${THREADS_SUFFIX}:${PORTSDIR}/lang/tcl${SHORT_TK_VER}-thread
		49	.endif
42		50
43	.include <bsd.port.pre.mk>	51	SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}"
44		52
45	CONFIGURE_ARGS+= --enable-threads	53	.include <bsd.port.pre.mk>
46	CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
47		54
48	.if defined(WITH_THREADS)	55	.if defined(BUILDING_TK_THREADS)
49	THREADS_SUFFIX= -threads	56	CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THREADS_SUFFIX}
50	USE_TCL= 84-thread	57	CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
51	USE_TCL_BUILD= 84-thread	58	ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}"
52	CONFLICTS= tk-8.4*	59	LATEST_LINK= tk85${THREADS_SUFFIX}
53	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
54	.else	60	.else
55	CONFLICTS= tk-threads-8.4*	61	CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}
56	.endif	62	CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}"
57		63
58	.if defined(WITH_WISH_WRAPPER)	64	.if defined(WITH_WISH_WRAPPER)
59	RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper	65	RUN_DEPENDS+= wish:${PORTSDIR}/lang/tcl-tk-wrapper
Lines 371-395 Link Here
371		377
372	.endif	378	.endif
373		379
		380	.endif # defined(BUILDING_TK_THREADS)
		381
374	TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}	382	TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
375		383
376	pre-everything::	384	pre-everything::
377	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi	385	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
378		386
379	pre-configure:	387	post-patch:
		388	@${REINPLACE_CMD} -e 's\|@TK_SHARED_BUILD@\|#@TK_SHARED_BUILD@\|g' ${WRKSRC}/Makefile.in
		389	.if defined(BUILDING_TK_THREADS)
380	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \	390	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
		391	-e 's\|$${TCL_TRIM_DOTS}\|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}\|g' \
		392	-e 's\|-ltk$${VERSION}\|-ltk$${VERSION}${THREADS_SUFFIX}\|g' \
		393	-e 's/-ltk`echo $${VERSION} \| tr -d .`/-ltk`echo $${VERSION} \| tr -d .`${THREADS_SUFFIX}/g' \
		394	-e 's\|-ltkstub$${TK_VERSION}\|-ltkstub$${TK_VERSION}${THREADS_SUFFIX}\|g' \
		395	-e 's/-ltkstub`echo $${TK_VERSION} \| tr -d .`/-ltkstub`echo $${TK_VERSION} \| tr -d .`${THREADS_SUFFIX}/g' \
381	${WRKSRC}/configure	396	${WRKSRC}/configure
		397	@${REINPLACE_CMD} -e 's\|libtk$${SHORT_TK_VER}\|libtk$${SHORT_TK_VER}${THREADS_SUFFIX}\|g' \
		398	-e 's\|$$(BIN_INSTALL_DIR)/wish$$(VERSION)\|$$(BIN_INSTALL_DIR)/wish$$(VERSION)${THREADS_SUFFIX}\|g' \
		399	-e 's\|tk$$(VERSION)/tkConfig.sh\|tk$$(VERSION)/tkConfig${THREADS_SUFFIX}.sh\|g' \
		400	-e 's\|$$(LIB_INSTALL_DIR)$$(TK_PKG_DIR)\|${WRKDIR}\|g' \
		401	-e 's\|$$(MINOR_VERSION)$$(TCLPATCHL)\|$$(MINOR_VERSION)$$(TCLPATCHL)${THREADS_SUFFIX}\|g' \
		402	${WRKSRC}/Makefile.in
		403	.endif
382		404
383	post-configure:	405	post-configure:
384	${REINPLACE_CMD} \	406	${REINPLACE_CMD} \
385	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TKBASE}\|' \	407	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TKBASE}\|' \
386	${WRKSRC}/tkConfig.sh	408	${WRKSRC}/tkConfig.sh
387		409
		410	.if defined(BUILDING_TK_THREADS)
		411	do-install:
		412	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
		413	@${MKDIR} ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}
		414	@${LN} -sf ${PREFIX}/lib/tk${TK_VER}/tkConfig${THREADS_SUFFIX}.sh \
		415	${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/tkConfig.sh
		416	.endif
		417
388	post-install:	418	post-install:
389	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/	419	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
		420	.if !defined(BUILDING_TK_THREADS) && !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK84_MAN)
390	${MKDIR} ${DATADIR}	421	${MKDIR} ${DATADIR}
391	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}	422	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
392	.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK84_MAN)
393	.for mp in ${MAN1} ${MAN3} ${MANN}	423	.for mp in ${MAN1} ${MAN3} ${MANN}
394	@${REINPLACE_CMD} -e 's\|^.so man.macros\|.so ${DATADIR}/man.macros\|' \	424	@${REINPLACE_CMD} -e 's\|^.so man.macros\|.so ${DATADIR}/man.macros\|' \
395	${WRKSRC}/../doc/${mp}	425	${WRKSRC}/../doc/${mp}

Lines 1-3 Link Here

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

Line 0 Link Here

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

Line 0 Link Here

(-)x11-toolkits/tk84/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/tk84-thread/Makefile (-1 / +1 lines)
5	# $FreeBSD: ports/x11-toolkits/tk84-thread/Makefile,v 1.1 2007/03/13 08:44:37 miwi Exp $	5	# $FreeBSD: ports/x11-toolkits/tk84-thread/Makefile,v 1.1 2007/03/13 08:44:37 miwi Exp $
6	#	6	#
7		7
8	WITH_THREADS= yes	8	BUILDING_TK_THREADS= yes
9		9
10	MASTERDIR= ${.CURDIR}/../tk84	10	MASTERDIR= ${.CURDIR}/../tk84

Return to bug 110402