aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits/tix/files/patch-ac
blob: fbfaffccf657f501a9ea3d8436465018a92ed719 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
--- Makefile.in.orig    Tue Sep 23 16:57:18 1997
+++ Makefile.in Wed Apr  7 03:04:59 1999
@@ -29,7 +29,7 @@
 # Directory in which to install the library of Tix scripts and demos
 # (note: you can set the TIX_LIBRARY environment variable at run-time to
 # override the compiled-in location):
-TIX_LIBRARY =  $(prefix)/lib/tix$(TIX_VERSION)
+TIX_LIBRARY =  $(prefix)/share/tix$(TIX_VERSION)
 
 # Directory in which to install the archive libtix.a:
 LIB_DIR =  $(exec_prefix)/lib
@@ -70,16 +70,16 @@
 TK_GENERIC_DIR  = $(TK_SRC_DIR)/generic
 
 # Libraries to use when linking:
-LIBS = @ITK_BUILD_LIB_SPEC@ @ITCL_BUILD_LIB_SPEC@ \
-    @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ @TK_LIBS@
+LIBS = @ITK_LIB_SPEC@ @ITCL_LIB_SPEC@ \
+    @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
 
 # Libraries for building a stand-alone Tclsh.
 #
-LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@
+LIBS_TCLONLY = @TCL_LIB_SPEC@ @TCL_LIBS@
 
-RUN_TCLSH  = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
-         TK_LIBRARY=$(TK_SRC_DIR)/library \
-             $(TCL_SRC_DIR)/unix/tclsh
+RUN_TCLSH  = TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.0 \
+         TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.0 \
+             $(TCL_SRC_DIR)/../../bin/tclsh8.0
 
 
 #----------------------------------------------------------------
@@ -117,6 +117,9 @@
 TK_SAMEXE_FILE  = @TK_SAMEXE_FILE@
 TIX_SAMEXE_FILE     = @TIX_SAMEXE_FILE@
 
+FBSD_TIX_LIB_PREFIX!= echo $(TIX_LIB_FILE) | sed -e 's/\.//g' -e 's/[so]*[0-9]*$$//'
+FBSD_TIX_SAM_PREFIX!= echo $(TIX_SAM_FILE) | sed -e 's/\.//g' -e 's/[so]*[0-9]*$$//'
+
 INST_EXE         = $(TIX_EXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT)
 INST_TIX_SAMEXE  = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT)
 INST_TK_SAMEXE   = $(TK_SAMEXE_FILE)8.0
@@ -210,29 +213,29 @@
 # scripts of TK must be included in the fixed order.
 #----------------------------------------------------------------------
 
-TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.0/*.tcl
 
 TK_SCRIPTS = \
-    $(TK_SRC_DIR)/library/bgerror.tcl \
-    $(TK_SRC_DIR)/library/dialog.tcl \
-    $(TK_SRC_DIR)/library/focus.tcl \
-    $(TK_SRC_DIR)/library/obsolete.tcl \
-    $(TK_SRC_DIR)/library/optMenu.tcl \
-    $(TK_SRC_DIR)/library/palette.tcl \
-    $(TK_SRC_DIR)/library/tearoff.tcl \
-    $(TK_SRC_DIR)/library/clrpick.tcl \
-    $(TK_SRC_DIR)/library/comdlg.tcl \
-    $(TK_SRC_DIR)/library/msgbox.tcl \
-    $(TK_SRC_DIR)/library/tkfbox.tcl \
-    $(TK_SRC_DIR)/library/xmfbox.tcl \
-    $(SRC_DIR)/generic/tk4.2/tk.tcl \
-    $(TK_SRC_DIR)/library/button.tcl \
-    $(TK_SRC_DIR)/library/entry.tcl \
-    $(TK_SRC_DIR)/library/listbox.tcl \
-    $(TK_SRC_DIR)/library/menu.tcl \
-    $(TK_SRC_DIR)/library/scale.tcl \
-    $(TK_SRC_DIR)/library/scrlbar.tcl \
-    $(TK_SRC_DIR)/library/text.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/bgerror.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/dialog.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/focus.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/obsolete.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/optMenu.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/palette.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/tearoff.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/clrpick.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/comdlg.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/msgbox.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/tkfbox.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/xmfbox.tcl \
+    $(SRC_DIR)/generic/tk8.0/tk.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/button.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/entry.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/listbox.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/menu.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/scale.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/scrlbar.tcl \
+    $(TK_SRC_DIR)/../../lib/tk8.0/text.tcl \
     $(SRC_DIR)/generic/tk8.0/console.tcl
 
 TIX_SCRIPTS = \
@@ -246,6 +249,9 @@
    rm -f $(TIX_LIB_FILE)
    @TIX_MAKE_LIB@
    $(RANLIB) $(TIX_LIB_FILE)
+   ln -fs $(TIX_LIB_FILE) `echo $(TIX_LIB_FILE) | sed -e 's/[\.0-9]*$$//'`
+   ln $(TIX_LIB_FILE) $(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX).1
+   ln `echo $(TIX_LIB_FILE) | sed -e 's/[\.0-9]*$$//'` $(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX)
 
 $(TCL_SAM_FILE): $(TCL_SAM_OBJS)
    rm -f $(TCL_SAM_FILE)
@@ -261,6 +267,7 @@
    rm -f $(TIX_SAM_FILE)
    @TIX_MAKE_SAM@
    $(RANLIB) $(TIX_SAM_FILE)
+   ln $(TIX_SAM_FILE) $(FBSD_TIX_SAM_PREFIX)$(SHLIB_SUFFIX).1
 
 $(TIX_EXE_FILE): tixAppInit.o $(TIX_LIB_FILE)
    $(CC) @LD_FLAGS@ tixAppInit.o @TIX_BUILD_LIB_SPEC@ $(LIBS) \
@@ -471,8 +478,8 @@
        else true; \
        fi; \
        done;
-   @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)"
-   @$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
+   @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX).1"
+   @$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(FBSD_TIX_LIB_PREFIX)$(SHLIB_SUFFIX).1
    @echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)"
    @$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE)
 
@@ -508,8 +515,8 @@
        else true; \
        fi; \
        done;
-   @echo "Installing $(TIX_SAM_FILE) as $(LIB_DIR)/$(TIX_SAM_FILE)"
-   @$(INSTALL_PROGRAM) $(TIX_SAM_FILE) $(LIB_DIR)/$(TIX_SAM_FILE)
+   @echo "Installing $(TIX_SAM_FILE) as $(LIB_DIR)/$(FBSD_TIX_SAM_PREFIX)$(SHLIB_SUFFIX).1"
+   @$(INSTALL_PROGRAM) $(TIX_SAM_FILE) $(LIB_DIR)/$(FBSD_TIX_SAM_PREFIX)$(SHLIB_SUFFIX).1
 
 
 install: _install_