1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Use plus patches

This commit is contained in:
Justin M. Seger 2000-05-01 16:02:20 +00:00
parent 7d09d34539
commit d81e52ad84
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=28237
10 changed files with 66 additions and 40 deletions

View File

@ -8,15 +8,16 @@
PORTNAME= tk
PORTVERSION= 8.3.0
CATEGORIES= x11-toolkits tk83
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
DISTNAME= ${PORTNAME}${PORTVERSION}
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/devel/ \
http://www.neosoft.com/tcl/ftparchive/sorted/packages-8.0/devel/
DISTNAME= ${PORTNAME}${PORTVERSION}plus
MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_XLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1

View File

@ -1 +1 @@
MD5 (tk8.3.0.tar.gz) = b98369476607536e8384940036890d5c
MD5 (tk8.3.0plus.tar.gz) = 86ba6dba8407ffd3567eaf7911e81c11

View File

@ -1,5 +1,5 @@
--- configure.orig Thu Feb 10 06:11:02 2000
+++ configure Mon Apr 24 15:59:27 2000
--- configure.orig Sun Feb 20 06:30:02 2000
+++ configure Mon May 1 11:21:14 2000
@@ -1763,7 +1763,7 @@
LDFLAGS="-Wl,-Bexport"
LD_SEARCH_FLAGS=""
@ -25,3 +25,12 @@
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
@@ -4005,7 +4007,7 @@
eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}"
TCL_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_LIB_FLAG)'
-TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)'
+TCL_STUB_LIB_SPEC='/usr/local/lib/libtclstub83.a'
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"

View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Thu Feb 10 06:11:01 2000
+++ Makefile.in Mon Apr 24 16:10:36 2000
--- Makefile.in.orig Sun Feb 20 06:39:43 2000
+++ Makefile.in Mon May 1 10:37:26 2000
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@ -11,7 +11,7 @@
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -153,7 +155,7 @@
@@ -154,7 +156,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -20,7 +20,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -190,7 +192,7 @@
@@ -195,7 +197,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
@ -29,7 +29,7 @@
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
@@ -361,8 +363,14 @@
@@ -371,8 +373,14 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
@ -44,16 +44,16 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
@@ -424,7 +432,7 @@
@@ -442,7 +450,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
do \
if [ ! -d $$i ] ; then \
@@ -442,12 +450,18 @@
@@ -460,14 +468,20 @@
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -64,6 +64,8 @@
+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a)
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
@echo "Installing pkgIndex.tcl"
@$(INSTALL_DATA) pkgIndex.tk $(SCRIPT_INSTALL_DIR)/pkgIndex.tcl
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
@ -73,7 +75,7 @@
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
@@ -461,6 +475,7 @@
@@ -481,6 +495,7 @@
install-libraries:
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@ -81,7 +83,7 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -474,10 +489,16 @@
@@ -494,10 +509,16 @@
chmod +x $(UNIX_DIR)/install-sh; \
fi
@echo "Installing header files";
@ -100,7 +102,7 @@
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
$(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
@@ -543,7 +564,6 @@
@@ -563,7 +584,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@ -108,15 +110,15 @@
@echo "Installing C API (.3) docs";
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
@@ -553,7 +573,6 @@
@@ -573,7 +593,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.3) docs";
@echo "Cross-linking C API (.3) docs";
- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
@echo "Installing command (.n) docs";
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
@@ -563,7 +582,6 @@
@@ -583,7 +602,6 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";

View File

@ -120,6 +120,7 @@ lib/tk%%TK_VER%%/msgbox.tcl
lib/tk%%TK_VER%%/obsolete.tcl
lib/tk%%TK_VER%%/optMenu.tcl
lib/tk%%TK_VER%%/palette.tcl
lib/tk%%TK_VER%%/pkgIndex.tcl
lib/tk%%TK_VER%%/prolog.ps
lib/tk%%TK_VER%%/safetk.tcl
lib/tk%%TK_VER%%/scale.tcl

View File

@ -8,15 +8,16 @@
PORTNAME= tk
PORTVERSION= 8.3.0
CATEGORIES= x11-toolkits tk83
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
DISTNAME= ${PORTNAME}${PORTVERSION}
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/devel/ \
http://www.neosoft.com/tcl/ftparchive/sorted/packages-8.0/devel/
DISTNAME= ${PORTNAME}${PORTVERSION}plus
MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_XLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1

View File

@ -1 +1 @@
MD5 (tk8.3.0.tar.gz) = b98369476607536e8384940036890d5c
MD5 (tk8.3.0plus.tar.gz) = 86ba6dba8407ffd3567eaf7911e81c11

View File

@ -1,5 +1,5 @@
--- configure.orig Thu Feb 10 06:11:02 2000
+++ configure Mon Apr 24 15:59:27 2000
--- configure.orig Sun Feb 20 06:30:02 2000
+++ configure Mon May 1 11:21:14 2000
@@ -1763,7 +1763,7 @@
LDFLAGS="-Wl,-Bexport"
LD_SEARCH_FLAGS=""
@ -25,3 +25,12 @@
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
@@ -4005,7 +4007,7 @@
eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}"
TCL_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_LIB_FLAG)'
-TCL_STUB_LIB_SPEC='-L$(TCL_BIN_DIR) $(TCL_STUB_LIB_FLAG)'
+TCL_STUB_LIB_SPEC='/usr/local/lib/libtclstub83.a'
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"

View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Thu Feb 10 06:11:01 2000
+++ Makefile.in Mon Apr 24 16:10:36 2000
--- Makefile.in.orig Sun Feb 20 06:39:43 2000
+++ Makefile.in Mon May 1 10:37:26 2000
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@ -11,7 +11,7 @@
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -153,7 +155,7 @@
@@ -154,7 +156,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -20,7 +20,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -190,7 +192,7 @@
@@ -195,7 +197,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
@ -29,7 +29,7 @@
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
@@ -361,8 +363,14 @@
@@ -371,8 +373,14 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
@ -44,16 +44,16 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
@@ -424,7 +432,7 @@
@@ -442,7 +450,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
do \
if [ ! -d $$i ] ; then \
@@ -442,12 +450,18 @@
@@ -460,14 +468,20 @@
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -64,6 +64,8 @@
+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a)
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
@echo "Installing pkgIndex.tcl"
@$(INSTALL_DATA) pkgIndex.tk $(SCRIPT_INSTALL_DIR)/pkgIndex.tcl
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
@ -73,7 +75,7 @@
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
@@ -461,6 +475,7 @@
@@ -481,6 +495,7 @@
install-libraries:
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@ -81,7 +83,7 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -474,10 +489,16 @@
@@ -494,10 +509,16 @@
chmod +x $(UNIX_DIR)/install-sh; \
fi
@echo "Installing header files";
@ -100,7 +102,7 @@
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
$(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
@@ -543,7 +564,6 @@
@@ -563,7 +584,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@ -108,15 +110,15 @@
@echo "Installing C API (.3) docs";
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
@@ -553,7 +573,6 @@
@@ -573,7 +593,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.3) docs";
@echo "Cross-linking C API (.3) docs";
- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
@echo "Installing command (.n) docs";
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
@@ -563,7 +582,6 @@
@@ -583,7 +602,6 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";

View File

@ -120,6 +120,7 @@ lib/tk%%TK_VER%%/msgbox.tcl
lib/tk%%TK_VER%%/obsolete.tcl
lib/tk%%TK_VER%%/optMenu.tcl
lib/tk%%TK_VER%%/palette.tcl
lib/tk%%TK_VER%%/pkgIndex.tcl
lib/tk%%TK_VER%%/prolog.ps
lib/tk%%TK_VER%%/safetk.tcl
lib/tk%%TK_VER%%/scale.tcl