Attachment #76480 for bug #110238

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





PORTNAME=	tk
PORTVERSION=	8.3.5
PORTREVISION=	6
CATEGORIES=	x11-toolkits tk83
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	tcl

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=	Too many _MLINKS for README.html
TCL83_PORT?=	lang/tcl83
MANCOMPRESSED=	no

OPTIONS=	TK83_MAN "Install tk 8.3 manpages" off \
		WISH_WRAPPER "Require wish wrapper from ports" off

.include <bsd.port.pre.mk>

	${REINPLACE_CMD} \
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
		${WRKSRC}/tkConfig.sh
.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK83_MAN)
	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
		${WRKSRC}/Makefile
.endif

post-install:
	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK83_MAN)
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
.endif

test:




--- Makefile.in.orig	Wed Oct 23 19:45:50 2002
+++ Makefile.in	Mon Mar 12 18:00:56 2007
@@ -58,6 +58,8 @@
 SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
 
 # Directory in which to install the include file tk.h:
 INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
+INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
 

 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
 	rm -f ${STUB_LIB_FILE}
 	@MAKE_STUB_LIB@
@@ -454,13 +464,13 @@
 	gdb ./wish --command=gdb.run
 	rm gdb.run
 
-install: all install-binaries install-libraries install-demos install-doc
+install: all install-binaries install-libraries install-demos
 
 # Note: before running ranlib below, must cd to target directory because
 # some ranlibs write to current directory, and this might not always be
 # possible (e.g. if installing as root).
 

-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
-		$(GENERIC_DIR)/tkDecls.h ; \
+	@for i in $(GENERIC_DIR)/*.h ; \
+	    do \
-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+	    done;
+	@for i in $(UNIX_DIR)/*.h ; \

+	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
+	    done;
+	@for i in $(INSTALL_HDRS) ; \
 	    do \
-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+	    j=`basename $$i` ; \
+	    ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
 	    done;

Return to bug 110238

Lines 7-13 Link Here

(-)x11-toolkits/tk83/Makefile (-10 / +4 lines)
7		7
8	PORTNAME= tk	8	PORTNAME= tk
9	PORTVERSION= 8.3.5	9	PORTVERSION= 8.3.5
10	PORTREVISION= 5	10	PORTREVISION= 6
11	CATEGORIES= x11-toolkits tk83	11	CATEGORIES= x11-toolkits tk83
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= tcl	13	MASTER_SITE_SUBDIR= tcl
Lines 31-43 Link Here
31	CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1	31	CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
32	MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}	32	MAKE_ENV= SHORT_TK_VER=${SHORT_TK_VER}
33	PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}	33	PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
34	PKGINSTALL= ${PKGDIR}/pkg-install.wish
35	PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish
36	NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html	34	NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html
37	TCL83_PORT?= lang/tcl83	35	TCL83_PORT?= lang/tcl83
38	MANCOMPRESSED= no	36	MANCOMPRESSED= no
39		37
40	OPTIONS= TK83_MAN "Install tk 8.3 manpages" on \	38	OPTIONS= TK83_MAN "Install tk 8.3 manpages" off \
41	WISH_WRAPPER "Require wish wrapper from ports" off	39	WISH_WRAPPER "Require wish wrapper from ports" off
42		40
43	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
Lines 338-352 Link Here
338	${REINPLACE_CMD} \	336	${REINPLACE_CMD} \
339	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TKBASE}\|' \	337	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TKBASE}\|' \
340	${WRKSRC}/tkConfig.sh	338	${WRKSRC}/tkConfig.sh
341	.if defined(NO_INSTALL_MANPAGES) \|\| !defined(WITH_TK83_MAN)
342	${REINPLACE_CMD} -e 's\|^MAN_INSTALL_DIR.*$$\|MAN_INSTALL_DIR = ${WRKDIR}\|' \
343	${WRKSRC}/Makefile
344	.endif
345		339
346	post-install:	340	post-install:
347	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/	341	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
348	.if exists(${PKGINSTALL})	342	.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK83_MAN)
349	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}	343	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
350	.endif	344	.endif
351		345
352	test:	346	test:

Lines 1-11 Link Here

(-)x11-toolkits/tk83/files/patch-ab (-9 / +14 lines)
1	--- Makefile.in.orig Wed Oct 23 19:45:50 2002	1	--- Makefile.in.orig Wed Oct 23 19:45:50 2002
2	+++ Makefile.in Tue Nov 12 21:56:31 2002	2	+++ Makefile.in Mon Mar 12 18:00:56 2007
3	@@ -57,7 +57,9 @@	3	@@ -58,6 +58,8 @@
4	SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)
5		4
6	# Directory in which to install the include file tk.h:	5	# Directory in which to install the include file tk.h:
7	-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)	6	INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
8	+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
9	+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic	7	+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
10	+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix	8	+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
11		9
Lines 53-59 Link Here
53	${STUB_LIB_FILE}: ${STUB_LIB_OBJS}	51	${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
54	rm -f ${STUB_LIB_FILE}	52	rm -f ${STUB_LIB_FILE}
55	@MAKE_STUB_LIB@	53	@MAKE_STUB_LIB@
56	@@ -460,7 +470,7 @@	54	@@ -454,13 +464,13 @@
		55	gdb ./wish --command=gdb.run
		56	rm gdb.run
		57
		58	-install: all install-binaries install-libraries install-demos install-doc
		59	+install: all install-binaries install-libraries install-demos
		60
		61	# Note: before running ranlib below, must cd to target directory because
57	# some ranlibs write to current directory, and this might not always be	62	# some ranlibs write to current directory, and this might not always be
58	# possible (e.g. if installing as root).	63	# possible (e.g. if installing as root).
59		64
Lines 97-104 Link Here
97	- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \	102	- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
98	- $(GENERIC_DIR)/tkDecls.h ; \	103	- $(GENERIC_DIR)/tkDecls.h ; \
99	+ @for i in $(GENERIC_DIR)/*.h ; \	104	+ @for i in $(GENERIC_DIR)/*.h ; \
100	do \	105	+ do \
101	- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
102	+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \	106	+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
103	+ done;	107	+ done;
104	+ @for i in $(UNIX_DIR)/*.h ; \	108	+ @for i in $(UNIX_DIR)/*.h ; \
Lines 106-112 Link Here
106	+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \	110	+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
107	+ done;	111	+ done;
108	+ @for i in $(INSTALL_HDRS) ; \	112	+ @for i in $(INSTALL_HDRS) ; \
109	+ do \	113	do \
		114	- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
110	+ j=`basename $$i` ; \	115	+ j=`basename $$i` ; \
111	+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \	116	+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
112	done;	117	done;