Update to 8.6.8.
Stop building/installing unneeded libs. Patch Tk's Makefile to install the license file instead of using a post-install target since the Makefile gets patched anyway. Don't be overly strict with installed file permissions.
This commit is contained in:
stu
parent
171c331c6d
commit
5e1d4a352b
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2017/11/22 12:46:04 stu Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2017/12/25 04:34:48 stu Exp $
|
||||
|
||||
COMMENT = graphical toolkit for Tcl
|
||||
|
||||
P = 7
|
||||
P = 8
|
||||
DISTNAME = tk8.6.${P}
|
||||
PKGNAME = tk-8.6.${P}
|
||||
REVISION = 0
|
||||
SHARED_LIBS = tk86 1.${P}
|
||||
CATEGORIES = x11 x11/tk
|
||||
HOMEPAGE = http://www.tcl.tk/
|
||||
@ -43,13 +42,8 @@ CONFIGURE_ARGS += --includedir="${PREFIX}/include/tk8.6" \
|
||||
--enable-man-symlinks \
|
||||
--disable-rpath \
|
||||
--with-tcl="${LOCALBASE}/lib/tcl/tcl8.6" \
|
||||
EXTRA_INSTALL_BINARIES='@echo "Installing libtk86.a to $$(LIB_INSTALL_DIR)/" \
|
||||
&& $$(INSTALL_DATA) libtk86.a $$(LIB_INSTALL_DIR)/libtk86.a \
|
||||
&& (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtk86.a)' \
|
||||
SHLIB_VERSION="${LIBtk86_VERSION}"
|
||||
|
||||
ALL_TARGET = all libtk86.a
|
||||
|
||||
TEST_IS_INTERACTIVE = X11
|
||||
WRKSRC = ${WRKDIST}/unix
|
||||
TEST_TARGET = test
|
||||
@ -61,9 +55,4 @@ TESTFLAGS =
|
||||
pre-test:
|
||||
mkdir -p ${TESTHOME}
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKDIST}/license.terms ${PREFIX}/lib/tcl/tk8.6/man
|
||||
ln -s libtk86.a ${PREFIX}/lib/libtk86_pic.a
|
||||
ln -s libtkstub86.a ${PREFIX}/lib/libtkstub86_pic.a
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (tk8.6.7-src.tar.gz) = Bh3io1T5t8fQTeOYTJDJvG3Tobg3e7RVCfGtio1jN6o=
|
||||
SIZE (tk8.6.7-src.tar.gz) = 4282972
|
||||
SHA256 (tk8.6.8-src.tar.gz) = See8oI3elRlaJ/WU98hQsIi+NXp8cJbkThFYx6X9ezM=
|
||||
SIZE (tk8.6.8-src.tar.gz) = 4319854
|
||||
|
||||
@ -1,22 +1,12 @@
|
||||
$OpenBSD: patch-unix_Makefile_in,v 1.5 2017/05/10 01:21:05 stu Exp $
|
||||
--- unix/Makefile.in.orig Tue Jul 26 10:07:50 2016
|
||||
+++ unix/Makefile.in Sat Apr 22 02:21:57 2017
|
||||
@@ -593,6 +593,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
||||
rm -f $@
|
||||
@MAKE_STUB_LIB@
|
||||
|
||||
+libtk86.a: ${OBJS}
|
||||
+ rm -f $@
|
||||
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
|
||||
+
|
||||
# Build Aqua resource files
|
||||
${TK_RSRC_FILE}: $(AQUA_RESOURCES)
|
||||
rm -f $@
|
||||
@@ -736,10 +740,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
|
||||
$OpenBSD: patch-unix_Makefile_in,v 1.6 2017/12/25 04:34:48 stu Exp $
|
||||
Index: unix/Makefile.in
|
||||
--- unix/Makefile.in.orig
|
||||
+++ unix/Makefile.in
|
||||
@@ -737,10 +737,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
|
||||
echo "}";\
|
||||
fi \
|
||||
) > "$(PKG_INDEX)"; \
|
||||
+ chmod 444 "$(PKG_INDEX)"; \
|
||||
+ chmod 644 "$(PKG_INDEX)"; \
|
||||
fi
|
||||
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
|
||||
@@INSTALL_LIB@
|
||||
@ -24,7 +14,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2017/05/10 01:21:05 stu Exp $
|
||||
@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
|
||||
$(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
|
||||
chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
|
||||
@@ -757,7 +761,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
|
||||
@@ -758,7 +758,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
|
||||
@EXTRA_INSTALL_BINARIES@
|
||||
@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
|
||||
@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
|
||||
@ -33,20 +23,21 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2017/05/10 01:21:05 stu Exp $
|
||||
|
||||
install-libraries: libraries
|
||||
@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
|
||||
@@ -812,6 +816,7 @@ install-demos:
|
||||
@@ -813,6 +813,7 @@ install-demos:
|
||||
if [ -f $$i ] ; then \
|
||||
sed -e '3 s|exec wish|exec wish$(VERSION)|' \
|
||||
$$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
|
||||
+ chmod 444 "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
|
||||
+ chmod 644 "$(DEMO_INSTALL_DIR)"/`basename $$i`; \
|
||||
fi; \
|
||||
done;
|
||||
@for i in $(DEMOPROGS); \
|
||||
@@ -819,7 +824,7 @@ install-demos:
|
||||
if test $$i = "square"; then \
|
||||
rm -f "$(DEMO_INSTALL_DIR)/$$i"; \
|
||||
else \
|
||||
- chmod 755 "$(DEMO_INSTALL_DIR)/$$i"; \
|
||||
+ chmod 555 "$(DEMO_INSTALL_DIR)/$$i"; \
|
||||
fi; \
|
||||
done;
|
||||
@echo "Installing demo image files to $(DEMO_INSTALL_DIR)/images/";
|
||||
@@ -852,6 +853,9 @@ install-doc:
|
||||
@for i in $(TOP_DIR)/doc/*.n; do \
|
||||
$(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
|
||||
done
|
||||
+
|
||||
+ @echo "Installing license.terms to $(MAN_INSTALL_DIR)/"
|
||||
+ @$(INSTALL_DATA) $(TOP_DIR)/license.terms "$(MAN_INSTALL_DIR)"
|
||||
|
||||
install-headers:
|
||||
@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2017/05/10 01:21:05 stu Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2017/12/25 04:34:48 stu Exp $
|
||||
@option no-default-conflict
|
||||
@option is-branch
|
||||
@conflict tk->=8.6,<8.7
|
||||
@ -7,11 +7,8 @@ include/tk8.6/
|
||||
include/tk8.6/tk.h
|
||||
include/tk8.6/tkDecls.h
|
||||
include/tk8.6/tkPlatDecls.h
|
||||
lib/libtk86.a
|
||||
@lib lib/libtk86.so.${LIBtk86_VERSION}
|
||||
lib/libtk86_pic.a
|
||||
lib/libtkstub86.a
|
||||
lib/libtkstub86_pic.a
|
||||
lib/pkgconfig/tk86.pc
|
||||
lib/tcl/tk8.6/
|
||||
lib/tcl/tk8.6/bgerror.tcl
|
||||
@ -522,6 +519,7 @@ share/examples/tk8.6/image1.tcl
|
||||
share/examples/tk8.6/image2.tcl
|
||||
share/examples/tk8.6/images/
|
||||
share/examples/tk8.6/images/earth.gif
|
||||
share/examples/tk8.6/images/earthmenu.png
|
||||
share/examples/tk8.6/images/earthris.gif
|
||||
share/examples/tk8.6/images/flagdown.xbm
|
||||
share/examples/tk8.6/images/flagup.xbm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user