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

(-)x11-toolkits/tk87/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	tk
4
PORTNAME=	tk
5
DISTVERSION=	8.7a1
5
DISTVERSION=	8.7a3
6
CATEGORIES=	x11-toolkits
6
CATEGORIES=	x11-toolkits
7
MASTER_SITES=	SF/tcl/Tcl/${DISTVERSION} \
7
MASTER_SITES=	SF/tcl/Tcl/${DISTVERSION} \
8
		TCLTK/tcl8_7
8
		TCLTK/tcl8_7
(-)x11-toolkits/tk87/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1504851372
1
TIMESTAMP = 1580548188
2
SHA256 (tk8.7a1-src.tar.gz) = 131e4bae43a15dff0324c0479358bb42cfd7b8de0e1ca8d93c9207643c7144dd
2
SHA256 (tk8.7a3-src.tar.gz) = 2580ea3d9bc46e175cca01de97868d64806bc754af2f06943261416fcdadf07c
3
SIZE (tk8.7a1-src.tar.gz) = 4308746
3
SIZE (tk8.7a3-src.tar.gz) = 4617709
(-)x11-toolkits/tk87/files/patch-unix-Makefile.in (-2 / +45 lines)
Lines 1-5 Link Here
1
--- Makefile.in.orig	2017-09-03 10:29:26 UTC
1
--- Makefile.in.orig	2017-09-03 10:29:26 UTC
2
+++ Makefile.in
2
+++ Makefile.in
3
@@ -64,6 +64,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
4
 
5
 # Directory in which to install the include file tk.h:
6
 INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
7
+GENERIC_INCLUDE_INSTALL_DIR=	$(INCLUDE_INSTALL_DIR)/generic
8
+UNIX_INCLUDE_INSTALL_DIR=	$(INCLUDE_INSTALL_DIR)/unix
9
 
10
 # Path to the private tk header dir:
11
 PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
3
@@ -92,7 +94,7 @@ HTML_DIR		= @HTML_DIR@
12
@@ -92,7 +94,7 @@ HTML_DIR		= @HTML_DIR@
4
 HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
13
 HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
5
 
14
 
Lines 9-15 Link Here
9
 
18
 
10
 # Directory in which to install the demo files:
19
 # Directory in which to install the demo files:
11
 DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
20
 DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
12
@@ -699,8 +708,7 @@ INSTALL_DOC_TARGETS = install-doc
21
@@ -555,6 +557,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
22
 PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
23
 	$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
24
 
25
+INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h tkPlatDecls.h
26
+
27
 # The private headers we want installed for install-private-headers
28
 PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
29
 	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
30
@@ -699,8 +703,7 @@ INSTALL_DOC_TARGETS = install-doc
13
 INSTALL_DEV_TARGETS = install-headers
31
 INSTALL_DEV_TARGETS = install-headers
14
 INSTALL_DEMO_TARGETS = install-demos
32
 INSTALL_DEMO_TARGETS = install-demos
15
 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
33
 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
Lines 19-25 Link Here
19
 
37
 
20
 install: $(INSTALL_TARGETS)
38
 install: $(INSTALL_TARGETS)
21
 
39
 
22
@@ -755,9 +766,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
40
@@ -755,9 +758,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
23
 	    @INSTALL_STUB_LIB@ ; \
41
 	    @INSTALL_STUB_LIB@ ; \
24
 	fi
42
 	fi
25
 	@EXTRA_INSTALL_BINARIES@
43
 	@EXTRA_INSTALL_BINARIES@
Lines 32-34 Link Here
32
 
50
 
33
 install-libraries: libraries
51
 install-libraries: libraries
34
 	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
52
 	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
53
@@ -855,7 +858,8 @@ install-doc:
54
 install-headers:
55
 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
56
 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
57
-	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
58
+	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
59
+		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
60
 	    do \
61
 	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
62
 		echo "Making directory $$i"; \
63
@@ -864,9 +868,12 @@ install-headers:
64
 		fi; \
65
 	    done;
66
 	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
67
-	@for i in $(PUBLIC_HDRS); \
68
+	@${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
69
+	@${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
70
+	@for i in $(INSTALL_HDRS); \
71
 	    do \
72
-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
73
+	    j=`basename $$i` ; \
74
+	    ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
75
 	    done;
76
 	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
77
 	    do \
(-)x11-toolkits/tk87/pkg-plist (-1 / +39 lines)
Lines 1-7 Link Here
1
bin/wish%%TK_VER%%
1
bin/wish%%TK_VER%%
2
include/tk%%TK_VER%%/generic/default.h
3
include/tk%%TK_VER%%/generic/ks_names.h
4
include/tk%%TK_VER%%/generic/nanosvg.h
5
include/tk%%TK_VER%%/generic/nanosvgrast.h
6
include/tk%%TK_VER%%/generic/tk.h
7
include/tk%%TK_VER%%/generic/tk3d.h
8
include/tk%%TK_VER%%/generic/tkArray.h
9
include/tk%%TK_VER%%/generic/tkBusy.h
10
include/tk%%TK_VER%%/generic/tkButton.h
11
include/tk%%TK_VER%%/generic/tkCanvas.h
12
include/tk%%TK_VER%%/generic/tkColor.h
13
include/tk%%TK_VER%%/generic/tkDecls.h
14
include/tk%%TK_VER%%/generic/tkDList.h
15
include/tk%%TK_VER%%/generic/tkEntry.h
16
include/tk%%TK_VER%%/generic/tkFileFilter.h
17
include/tk%%TK_VER%%/generic/tkFont.h
18
include/tk%%TK_VER%%/generic/tkImgPhoto.h
19
include/tk%%TK_VER%%/generic/tkInt.h
20
include/tk%%TK_VER%%/generic/tkIntDecls.h
21
include/tk%%TK_VER%%/generic/tkIntPlatDecls.h
22
include/tk%%TK_VER%%/generic/tkIntXlibDecls.h
23
include/tk%%TK_VER%%/generic/tkMenu.h
24
include/tk%%TK_VER%%/generic/tkMenubutton.h
25
include/tk%%TK_VER%%/generic/tkPlatDecls.h
26
include/tk%%TK_VER%%/generic/tkPort.h
27
include/tk%%TK_VER%%/generic/tkScale.h
28
include/tk%%TK_VER%%/generic/tkScrollbar.h
29
include/tk%%TK_VER%%/generic/tkSelect.h
30
include/tk%%TK_VER%%/generic/tkText.h
31
include/tk%%TK_VER%%/generic/tkUndo.h
2
include/tk%%TK_VER%%/tk.h
32
include/tk%%TK_VER%%/tk.h
3
include/tk%%TK_VER%%/tkDecls.h
33
include/tk%%TK_VER%%/tkDecls.h
34
include/tk%%TK_VER%%/tkInt.h
35
include/tk%%TK_VER%%/tkIntXlibDecls.h
4
include/tk%%TK_VER%%/tkPlatDecls.h
36
include/tk%%TK_VER%%/tkPlatDecls.h
37
include/tk%%TK_VER%%/unix/tkUnixDefault.h
38
include/tk%%TK_VER%%/unix/tkUnixInt.h
39
include/tk%%TK_VER%%/unix/tkUnixPort.h
5
lib/libtkstub%%TK_VER%%.a
40
lib/libtkstub%%TK_VER%%.a
6
lib/libtk%%TK_VER%%.so
41
lib/libtk%%TK_VER%%.so
7
lib/libtk%%PKGNAMESUFFIX%%.so
42
lib/libtk%%PKGNAMESUFFIX%%.so
Lines 43-48 Link Here
43
%%DEMOS%%lib/tk%%TK_VER%%/demos/image1.tcl
78
%%DEMOS%%lib/tk%%TK_VER%%/demos/image1.tcl
44
%%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
79
%%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
45
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
80
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
81
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthmenu.png
46
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
82
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
47
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
83
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
48
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
84
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
Lines 178-183 Link Here
178
lib/tk%%TK_VER%%/unsupported.tcl
214
lib/tk%%TK_VER%%/unsupported.tcl
179
lib/tk%%TK_VER%%/xmfbox.tcl
215
lib/tk%%TK_VER%%/xmfbox.tcl
180
%%TKMAN%%man/man1/wish.tk%%PKGNAMESUFFIX%%.1.gz
216
%%TKMAN%%man/man1/wish.tk%%PKGNAMESUFFIX%%.1.gz
217
%%TKMAN%%man/man3/FindPhoto.tk%%PKGNAMESUFFIX%%.3.gz
218
%%TKMAN%%man/man3/FontId.tk%%PKGNAMESUFFIX%%.3.gz
219
%%TKMAN%%man/man3/MeasureChar.tk%%PKGNAMESUFFIX%%.3.gz
181
%%TKMAN%%man/man3/Tk_3DBorderColor.tk%%PKGNAMESUFFIX%%.3.gz
220
%%TKMAN%%man/man3/Tk_3DBorderColor.tk%%PKGNAMESUFFIX%%.3.gz
182
%%TKMAN%%man/man3/Tk_3DBorderGC.tk%%PKGNAMESUFFIX%%.3.gz
221
%%TKMAN%%man/man3/Tk_3DBorderGC.tk%%PKGNAMESUFFIX%%.3.gz
183
%%TKMAN%%man/man3/Tk_3DHorizontalBevel.tk%%PKGNAMESUFFIX%%.3.gz
222
%%TKMAN%%man/man3/Tk_3DHorizontalBevel.tk%%PKGNAMESUFFIX%%.3.gz
Lines 376-382 Link Here
376
%%TKMAN%%man/man3/Tk_NameOfJustify.tk%%PKGNAMESUFFIX%%.3.gz
415
%%TKMAN%%man/man3/Tk_NameOfJustify.tk%%PKGNAMESUFFIX%%.3.gz
377
%%TKMAN%%man/man3/Tk_NameOfRelief.tk%%PKGNAMESUFFIX%%.3.gz
416
%%TKMAN%%man/man3/Tk_NameOfRelief.tk%%PKGNAMESUFFIX%%.3.gz
378
%%TKMAN%%man/man3/Tk_NameToWindow.tk%%PKGNAMESUFFIX%%.3.gz
417
%%TKMAN%%man/man3/Tk_NameToWindow.tk%%PKGNAMESUFFIX%%.3.gz
379
%%TKMAN%%man/man3/Tk_Offset.tk%%PKGNAMESUFFIX%%.3.gz
380
%%TKMAN%%man/man3/Tk_OwnSelection.tk%%PKGNAMESUFFIX%%.3.gz
418
%%TKMAN%%man/man3/Tk_OwnSelection.tk%%PKGNAMESUFFIX%%.3.gz
381
%%TKMAN%%man/man3/Tk_Parent.tk%%PKGNAMESUFFIX%%.3.gz
419
%%TKMAN%%man/man3/Tk_Parent.tk%%PKGNAMESUFFIX%%.3.gz
382
%%TKMAN%%man/man3/Tk_ParseArgv.tk%%PKGNAMESUFFIX%%.3.gz
420
%%TKMAN%%man/man3/Tk_ParseArgv.tk%%PKGNAMESUFFIX%%.3.gz

Return to bug 243775