A couple more 'private' headers are needed by upcoming port(s).
Stricter LIB_DEPENDS wrt 'threaded' FLAVOR.
I bumped the package 'p' version and the shlib version - is that correct
for this case?
Stu
cvs server: Diffing inside .
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/Makefile,v
retrieving revision 1.7
diff -N -u -p Makefile
--- Makefile 26 Dec 2008 23:36:27 -0000 1.7
+++ Makefile 11 Mar 2009 17:41:50 -0000
@@ -4,9 +4,9 @@ COMMENT = graphical toolkit for Tcl
V = 8.5.6
DISTNAME = tk${V}
-PKGNAME = tk-${V}
+PKGNAME = tk-${V}p0
-SHARED_LIBS = tk85 0.3
+SHARED_LIBS = tk85 0.4
CATEGORIES = x11 x11/tk
@@ -25,7 +25,6 @@ WANTLIB = X11 Xau Xdmcp Xext Xft Xrender Xss c expat
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
DISTFILES = ${DISTNAME}-src.tar.gz
-LIB_DEPENDS = tcl85:tcl-${V}:lang/tcl/8.5
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
MAKE_FLAGS += TK_BUILD_EXP_FILE="libtk85.a" \
@@ -68,6 +67,9 @@ FLAVOR ?=
.if ${FLAVOR:L:Mthreaded}
CONFIGURE_ARGS += --enable-threads
WANTLIB += pthread
+LIB_DEPENDS = tcl85:tcl-${V}-${FLAVOR}:lang/tcl/8.5
+.else
+LIB_DEPENDS = tcl85:tcl-${V}:lang/tcl/8.5
.endif
WRKSRC = ${WRKDIST}/unix
cvs server: Diffing inside patches
Index: patches/patch-unix_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_Makefile_in,v
retrieving revision 1.3
diff -N -u -p patches/patch-unix_Makefile_in
--- patches/patch-unix_Makefile_in 21 Oct 2008 21:34:41 -0000 1.3
+++ patches/patch-unix_Makefile_in 11 Mar 2009 17:41:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:34:41 steven Exp $
---- unix/Makefile.in.orig Tue Oct 14 21:44:45 2008
-+++ unix/Makefile.in Tue Oct 21 23:26:45 2008
+--- unix/Makefile.in.orig Mon Dec 22 13:52:02 2008
++++ unix/Makefile.in Wed Mar 11 13:18:07 2009
@@ -92,6 +92,9 @@ HTML_DIR = @HTML_DIR@
# Directory in which to install html documentation:
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
@@ -11,17 +11,26 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
-@@ -547,8 +550,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
+@@ -537,7 +540,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbyte
+ AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
+
+-X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h
++X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h \
++ $(UNIX_DIR)/tkUnixDefault.h
+
+ # Currently private, eventually public
+ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
+@@ -548,7 +552,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec
# The private headers we want installed for install-private-headers
PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
-- $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
+ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
- $(TTK_HDRS) $(@tk_windowingsys...@_private_hdrs)
-+ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h
++ $(GENERIC_DIR)/default.h
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
-@@ -560,7 +562,7 @@ SHELL_ENV = \
+@@ -560,7 +564,7 @@ SHELL_ENV = \
all: binaries libraries doc
@@ -30,7 +39,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
libraries:
-@@ -580,6 +582,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -580,6 +584,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -41,7 +50,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
# Build Aqua resource files
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
rm -f $@
-@@ -635,7 +641,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
+@@ -635,7 +643,6 @@ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
# % make test TESTFLAGS="-verbose bps -file fileName.test"
test: test-classic test-ttk
@@ -49,7 +58,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
test-classic: tktest
$(SHELL_ENV) ./tktest $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
-@@ -688,18 +693,14 @@ install-strip:
+@@ -688,18 +695,14 @@ install-strip:
# possible (e.g. if installing as root).
install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
@@ -70,7 +79,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
@if test "x$(TK_SHARED_BUILD)" = "x1"; then \
echo "Creating package index $(PKG_INDEX)"; \
rm -f "$(PKG_INDEX)"; \
-@@ -709,19 +710,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
+@@ -709,19 +712,20 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $
echo "package ifneeded Tk
$(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
) > "$(PKG_INDEX)"; \
@@ -94,7 +103,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
@if test "$(STUB_LIB_FILE)" != "" ; then \
echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
@INSTALL_STUB_LIB@ ; \
-@@ -732,24 +734,35 @@ install-libraries: libraries
+@@ -732,24 +736,35 @@ install-libraries: libraries
@if test "$(@tk_windowingsys...@_xlib_hdrs)" != ""; then \
XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
@@ -135,7 +144,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
@list='$(@tk_windowingsys...@_xlib_hdrs)'; for i in $$list ; \
do \
$(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
-@@ -783,34 +796,33 @@ install-libraries: libraries
+@@ -783,34 +798,33 @@ install-libraries: libraries
done;
install-demos:
@@ -178,7 +187,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2008/10/21 21:3
fi; \
done;
-@@ -822,8 +834,7 @@ install-doc:
+@@ -822,8 +836,7 @@ install-doc:
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
cvs server: Diffing inside pkg
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tk/8.5/pkg/PLIST,v
retrieving revision 1.2
diff -N -u -p pkg/PLIST
--- pkg/PLIST 1 Oct 2008 19:48:46 -0000 1.2
+++ pkg/PLIST 11 Mar 2009 17:41:50 -0000
@@ -5,6 +5,7 @@
@bin bin/wish8.5
include/tk8.5/
include/tk8.5/generic/
+include/tk8.5/generic/default.h
include/tk8.5/generic/tk.h
include/tk8.5/generic/tkDecls.h
include/tk8.5/generic/tkInt.h
@@ -19,6 +20,7 @@ include/tk8.5/tk.h
include/tk8.5/tkDecls.h
include/tk8.5/tkPlatDecls.h
include/tk8.5/unix/
+include/tk8.5/unix/tkUnixDefault.h
include/tk8.5/unix/tkUnixInt.h
include/tk8.5/unix/tkUnixPort.h
lib/libtk85.a
