cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad symlinks.

Browse Source
This commit is contained in:
espie 2000-03-21 22:43:47 +00:00
parent eac4754f84
commit 7728fff438
4 changed files with 73 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lang/tcl80/patches/patch-ab
View File

@ -1,17 +1,18 @@
--- Makefile.in.orig Tue Mar 9 01:51:26 1999
+++ Makefile.in Thu Jan 13 19:55:37 2000
@@ -55,7 +55,9 @@
--- Makefile.in.orig Tue Mar 9 07:51:26 1999
+++ Makefile.in Tue Mar 21 22:27:57 2000
@@ -55,7 +55,10 @@
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
+BASE_INCLUDE_DIR = $(prefix)/include/tcl$(VERSION)
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(BASE_INCLUDE_DIR)
+GENERIC_INCLUDE_INSTALL_DIR = $(BASE_INCLUDE_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(BASE_INCLUDE_DIR)/unix
# Top-level directory in which to install manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -86,7 +88,7 @@
@@ -86,7 +89,7 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@ -20,7 +21,7 @@
# To disable ANSI-C procedure prototypes reverse the comment characters
# on the following lines:
@@ -146,7 +148,7 @@
@@ -146,7 +149,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -29,7 +30,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -331,14 +333,18 @@
@@ -331,14 +334,18 @@
SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
@ -50,7 +51,7 @@
# Make target which outputs the list of the .o contained in the Tcl lib
# usefull to build a single big shared library containing Tcl and other
@@ -433,7 +439,7 @@
@@ -433,7 +440,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -59,7 +60,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -445,16 +451,19 @@
@@ -445,16 +452,19 @@
done;
@echo "Installing $(TCL_LIB_FILE)"
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@ -78,12 +79,12 @@
install-libraries:
- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR); \
+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \
+ $(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) \
+ $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -472,8 +481,15 @@
@@ -472,8 +482,15 @@
else true; \
fi; \
done;
@ -93,15 +94,15 @@
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+ @echo "Installing $(TOP_DIR)unix/tclUnixPort.h"
+ @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR)
+ @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR)
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
echo "Installing $$i"; \
@@ -525,6 +541,13 @@
@@ -525,6 +542,13 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)

39
lang/tcl82/patches/patch-aa
View File

@ -1,17 +1,18 @@
--- Makefile.in.orig Tue Dec 14 22:59:18 1999
+++ Makefile.in Sat Jan 29 18:47:39 2000
@@ -48,7 +48,9 @@
--- Makefile.in.orig Wed Dec 15 04:59:18 1999
+++ Makefile.in Tue Mar 21 22:55:54 2000
@@ -48,7 +48,10 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
+BASE_INCLUDE_DIR = $(prefix)/include/tcl$(VERSION)
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(BASE_INCLUDE_DIR)
+GENERIC_INCLUDE_INSTALL_DIR = $(BASE_INCLUDE_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(BASE_INCLUDE_DIR)/unix
# Top-level directory in which to install manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -82,7 +84,7 @@
@@ -82,7 +85,7 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@ -20,7 +21,7 @@
# To disable ANSI-C procedure prototypes reverse the comment characters
# on the following lines:
@@ -156,7 +158,7 @@
@@ -156,7 +159,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -29,7 +30,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -383,7 +385,7 @@
@@ -383,7 +386,7 @@
all: binaries libraries doc
@ -38,7 +39,7 @@
libraries:
@@ -394,12 +396,15 @@
@@ -394,12 +397,15 @@
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f ${TCL_LIB_FILE}
@MAKE_LIB@
@ -56,7 +57,7 @@
# Make target which outputs the list of the .o contained in the Tcl lib
# usefull to build a single big shared library containing Tcl and other
@@ -504,8 +509,10 @@
@@ -504,8 +510,10 @@
@echo "Installing $(TCL_LIB_FILE)"
chmod +x $(SRC_DIR)/install-sh
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@ -68,7 +69,7 @@
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE)"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
@@ -514,7 +521,8 @@
@@ -514,7 +522,8 @@
@echo "Installing tclsh"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@echo "Installing tclConfig.sh"
@ -78,18 +79,18 @@
@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
echo "Installing $(TCL_STUB_LIB_FILE)"; \
$(INSTALL_DATA) $(STUB_LIB_FILE) \
@@ -522,8 +530,8 @@
@@ -522,8 +531,8 @@
fi
install-libraries: libraries
- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR); \
+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \
+ $(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) \
+ $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
@@ -542,11 +550,19 @@
@@ -542,11 +551,19 @@
fi; \
done;
chmod +x $(SRC_DIR)/install-sh
@ -98,20 +99,20 @@
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
do \
echo "Installing $$i"; \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \
done;
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
echo "Installing $$i"; \
@@ -603,6 +619,14 @@
@@ -603,6 +620,14 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)

33
x11/tk80/patches/patch-ab
View File

@ -1,17 +1,18 @@
--- Makefile.in.orig Tue Mar 9 01:53:50 1999
+++ Makefile.in Thu Jan 13 21:11:54 2000
@@ -56,7 +56,9 @@
--- Makefile.in.orig Tue Mar 9 07:53:50 1999
+++ Makefile.in Tue Mar 21 21:55:29 2000
@@ -56,7 +56,10 @@
BIN_DIR = $(exec_prefix)/bin
# Directory in which to install the include file tk.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
+BASE_INSTALL_DIR = $(prefix)/include/tk$(VERSION)
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(BASE_INSTALL_DIR)
+GENERIC_INCLUDE_INSTALL_DIR = $(BASE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(BASE_INSTALL_DIR)/unix
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -97,7 +99,7 @@
@@ -97,7 +100,7 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@ -20,7 +21,7 @@
# A "-I" switch that can be used when compiling to make all of the
# X11 include files accessible (the configure script will try to
@@ -112,7 +114,7 @@
@@ -112,7 +115,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
@ -29,7 +30,7 @@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
@@ -148,7 +150,7 @@
@@ -148,7 +151,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -38,7 +39,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -302,14 +304,18 @@
@@ -302,14 +305,18 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
@ -59,7 +60,7 @@
# Make target which outputs the list of the .o contained in the Tk lib
# usefull to build a single big shared library containing Tcl/Tk and other
@@ -365,7 +371,7 @@
@@ -365,7 +372,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -68,7 +69,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -377,15 +383,19 @@
@@ -377,15 +384,19 @@
done;
@echo "Installing $(TK_LIB_FILE)"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -86,11 +87,11 @@
install-libraries:
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
+ $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) \
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -395,8 +405,18 @@
@@ -395,8 +406,18 @@
else true; \
fi; \
done;
@ -100,12 +101,12 @@
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \
+ done;
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \

35
x11/tk82/patches/patch-ab
View File

@ -1,17 +1,18 @@
--- Makefile.in.orig Tue Dec 14 23:00:19 1999
+++ Makefile.in Sat Jan 29 21:17:41 2000
@@ -56,7 +56,9 @@
--- Makefile.in.orig Wed Dec 15 05:00:19 1999
+++ Makefile.in Tue Mar 21 23:14:10 2000
@@ -56,7 +56,10 @@
BIN_DIR = $(exec_prefix)/bin
# Directory in which to install the include file tk.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
+BASE_INSTALL_DIR = $(prefix)/include/tk$(VERSION)
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(BASE_INSTALL_DIR)
+GENERIC_INCLUDE_INSTALL_DIR = $(BASE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(BASE_INSTALL_DIR)/unix
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -99,7 +101,7 @@
@@ -99,7 +102,7 @@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@ -20,7 +21,7 @@
# A "-I" switch that can be used when compiling to make all of the
# X11 include files accessible (the configure script will try to
@@ -153,7 +155,7 @@
@@ -153,7 +156,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -29,7 +30,7 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -190,7 +192,7 @@
@@ -190,7 +193,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
@ -38,7 +39,7 @@
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
@@ -346,7 +348,7 @@
@@ -346,7 +349,7 @@
all: binaries libraries doc
@ -47,7 +48,7 @@
libraries:
@@ -361,12 +363,15 @@
@@ -361,12 +364,15 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
@ -65,7 +66,7 @@
# Make target which outputs the list of the .o contained in the Tk lib
# usefull to build a single big shared library containing Tcl/Tk and other
@@ -439,12 +444,15 @@
@@ -439,12 +445,15 @@
chmod +x $(UNIX_DIR)/install-sh
chmod +x $(UNIX_DIR)/mkLinks
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -83,15 +84,15 @@
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE)"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
@@ -458,6 +466,7 @@
@@ -458,6 +467,7 @@
install-libraries:
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
+ $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) \
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -468,11 +477,19 @@
@@ -468,11 +478,19 @@
fi; \
done;
chmod +x $(UNIX_DIR)/install-sh
@ -100,13 +101,13 @@
+ @for i in $(GENERIC_DIR)/*.h ; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
do \
echo "Installing $$i"; \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \
done;
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h