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

(-)x11-toolkits/tk85/Makefile (-13 / +16 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	tk
8
PORTNAME=	tk
9
PORTVERSION=	8.5.a.5
9
PORTVERSION=	8.5.a.5
10
PORTREVISION=	1
10
PORTREVISION=	2
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 37-43 Link Here
37
MANCOMPRESSED=	no
37
MANCOMPRESSED=	no
38
DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
38
DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
39
39
40
OPTIONS=	TK85_MAN "Install tk 8.5 manpages" on \
40
OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
41
		WISH_WRAPPER "Require wish wrapper from ports" off
41
		WISH_WRAPPER "Require wish wrapper from ports" off
42
42
43
.include <bsd.port.pre.mk>
43
.include <bsd.port.pre.mk>
Lines 69-75 Link Here
69
RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
69
RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
70
.endif
70
.endif
71
71
72
.if !defined(NO_INSTALL_MANPAGES) && !defined(WITHOUT_TK85_MAN)
72
.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
73
74
PLIST_SUB+=	INSTMAN='@comment '
75
76
.else
77
78
DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
79
PLIST_SUB+=	INSTMAN=''
73
80
74
MAN1=	wish.1
81
MAN1=	wish.1
75
MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
82
MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
Lines 389-414 Link Here
389
pre-configure:
396
pre-configure:
390
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
397
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
391
		${WRKSRC}/configure
398
		${WRKSRC}/configure
392
.for mp in ${MAN1} ${MAN3} ${MANN}
393
	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
394
		${WRKSRC}/../doc/${mp}
395
.endfor
396
399
397
post-configure:
400
post-configure:
398
	${REINPLACE_CMD} \
401
	${REINPLACE_CMD} \
399
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
402
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
400
		${WRKSRC}/tkConfig.sh
403
		${WRKSRC}/tkConfig.sh
401
.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TK85_MAN)
402
	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
403
		${WRKSRC}/Makefile
404
.endif
405
404
406
post-install:
405
post-install:
407
	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
406
	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
407
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
408
	${MKDIR} ${DATADIR}
408
	${MKDIR} ${DATADIR}
409
	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
409
	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
410
.if exists(${PKGINSTALL})
410
. for mp in ${MAN1} ${MAN3} ${MANN}
411
	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
411
	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
412
		${WRKSRC}/../doc/${mp}
413
. endfor
414
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
412
.endif
415
.endif
413
416
414
regression-test:	build
417
regression-test:	build
(-)x11-toolkits/tk85/files/patch-unix::Makefile.in (-2 / +11 lines)
Lines 1-5 Link Here
1
--- Makefile.in.orig	Tue Jan 30 11:20:44 2007
1
--- Makefile.in.orig	Mon Oct 23 15:45:33 2006
2
+++ Makefile.in	Tue Jan 30 11:30:35 2007
2
+++ Makefile.in	Mon Mar 12 18:32:29 2007
3
@@ -64,6 +64,8 @@
3
@@ -64,6 +64,8 @@
4
 
4
 
5
 # Directory in which to install the include file tk.h:
5
 # Directory in which to install the include file tk.h:
Lines 58-63 Link Here
58
 
58
 
59
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
59
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
60
 	rm -f $@
60
 	rm -f $@
61
@@ -613,7 +623,7 @@
62
 	gdb ./wish --command=gdb.run
63
 	rm gdb.run
64
 
65
-INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
66
+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
67
 
68
 install: $(INSTALL_TARGETS)
69
 
61
@@ -626,7 +636,8 @@
70
@@ -626,7 +636,8 @@
62
 # some ranlibs write to current directory, and this might not always be
71
 # some ranlibs write to current directory, and this might not always be
63
 # possible (e.g. if installing as root).
72
 # possible (e.g. if installing as root).
(-)x11-toolkits/tk85/pkg-plist (-2 / +2 lines)
Lines 166-173 Link Here
166
lib/tk%%TK_VER%%/tkfbox.tcl
166
lib/tk%%TK_VER%%/tkfbox.tcl
167
lib/tk%%TK_VER%%/unsupported.tcl
167
lib/tk%%TK_VER%%/unsupported.tcl
168
lib/tk%%TK_VER%%/xmfbox.tcl
168
lib/tk%%TK_VER%%/xmfbox.tcl
169
%%DATADIR%%/man.macros
169
%%INSTMAN%%%%DATADIR%%/man.macros
170
@dirrm %%DATADIR%%
170
%%INSTMAN%%@dirrm %%DATADIR%%
171
@dirrm lib/tk%%TK_VER%%/demos/images
171
@dirrm lib/tk%%TK_VER%%/demos/images
172
@dirrm lib/tk%%TK_VER%%/demos
172
@dirrm lib/tk%%TK_VER%%/demos
173
@dirrm lib/tk%%TK_VER%%/images
173
@dirrm lib/tk%%TK_VER%%/images

Return to bug 110258