diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-09-27 08:24:37 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 1998-09-27 08:24:37 +0000 |
commit | 8f7ae93769b355e3725bda1869b23bc8784bff1b (patch) | |
tree | 0e30ba373916b8361c9b40b6e3693cc60c013285 /japanese/tk42/files | |
parent | Remove empty directories on deinstall. (diff) |
ELFization patch.
PR: ports/8044
Submitted by: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
Notes
Notes:
svn path=/head/; revision=13452
Diffstat (limited to 'japanese/tk42/files')
-rw-r--r-- | japanese/tk42/files/patch-ab | 34 | ||||
-rw-r--r-- | japanese/tk42/files/patch-ac | 46 |
2 files changed, 43 insertions, 37 deletions
diff --git a/japanese/tk42/files/patch-ab b/japanese/tk42/files/patch-ab index a34551c98725..d4d4de916649 100644 --- a/japanese/tk42/files/patch-ab +++ b/japanese/tk42/files/patch-ab @@ -1,5 +1,5 @@ ---- ./unix/Makefile.in.ORIG Mon Feb 17 14:40:19 1997 -+++ ./unix/Makefile.in Mon Feb 17 14:58:24 1997 +--- ./unix/Makefile.in.ORIG Sun Sep 20 16:36:43 1998 ++++ ./unix/Makefile.in Sun Sep 20 16:43:49 1998 @@ -56,7 +56,9 @@ BIN_DIR = $(exec_prefix)/bin @@ -34,7 +34,17 @@ # To turn off the security checks that disallow incoming sends when # the X server appears to be insecure, reverse the comments on the -@@ -307,7 +309,7 @@ +@@ -291,6 +293,9 @@ + rm -f @TK_LIB_FILE@ + @MAKE_LIB@ + $(RANLIB) @TK_LIB_FILE@ ++.if ${PORTOBJFORMAT}X == elfX ++ ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'` ++.endif + + wish: $(WISH_OBJS) $(TK_LIB_FILE) + $(CC) @LD_FLAGS@ $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \ +@@ -307,12 +312,12 @@ test: tktest LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \ export LD_LIBRARY_PATH; \ @@ -43,7 +53,19 @@ TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \ ( echo cd $(TOP_DIR)/tests\; source all\; exit ) \ | ./tktest -geometry +0+0 -@@ -335,10 +337,12 @@ + +-install: install-binaries install-libraries install-demos install-man ++install: install-binaries install-libraries install-demos + + # Note: before running ranlib below, must cd to target directory because + # some ranlibs write to current directory, and this might not always be +@@ -332,13 +337,18 @@ + @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) + @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) ++.if ${PORTOBJFORMAT}X == elfX ++ @(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`) ++.endif @echo "Installing wish" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) @echo "Installing tkConfig.sh" @@ -57,7 +79,7 @@ $(SCRIPT_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -348,8 +352,18 @@ +@@ -348,8 +358,18 @@ else true; \ fi; \ done; @@ -78,7 +100,7 @@ for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/*.gif $(SRC_DIR)/library/*.xbm $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \ do \ echo "Installing $$i"; \ -@@ -401,28 +415,28 @@ +@@ -401,28 +421,28 @@ @cd $(SRC_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ diff --git a/japanese/tk42/files/patch-ac b/japanese/tk42/files/patch-ac index 86328c428eba..0f17b95d3da5 100644 --- a/japanese/tk42/files/patch-ac +++ b/japanese/tk42/files/patch-ac @@ -1,33 +1,5 @@ ---- ./unix/configure.ORIG Tue Feb 11 18:36:42 1997 -+++ ./unix/configure Tue Feb 11 18:40:37 1997 -@@ -660,14 +660,14 @@ - if test -n "$withval"; then - TCL_BIN_DIR=$withval - else -- TCL_BIN_DIR=`cd ../../tcl7.6/unix; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl7.6jp - fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } - fi --if test ! -f $TCL_BIN_DIR/Makefile; then -- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } -+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then -+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl, or you did not use ports?" 1>&2; exit 1; } - fi - - #-------------------------------------------------------------------- -@@ -2115,6 +2115,7 @@ - s%@SHLIB_VERSION@%$SHLIB_VERSION%g - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g - s%@TCL_VERSION@%$TCL_VERSION%g - s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g ---- ./unix/configure.in.ORIG Tue Feb 11 18:36:43 1997 -+++ ./unix/configure.in Tue Feb 11 18:40:56 1997 +--- ./unix/configure.in.ORIG Sun Sep 20 16:37:42 1998 ++++ ./unix/configure.in Sun Sep 20 16:51:27 1998 @@ -34,12 +34,12 @@ #-------------------------------------------------------------------- @@ -44,7 +16,19 @@ fi #-------------------------------------------------------------------- -@@ -330,6 +330,7 @@ +@@ -298,7 +298,11 @@ + if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then + TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" + eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}" ++ if test "X$PORTOBJFORMAT" = "Xelf"; then ++ MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} -Wl,-soname,${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" ++ else + MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" ++ fi + RANLIB=":" + else + TK_SHLIB_CFLAGS="" +@@ -330,6 +334,7 @@ AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_BUILD_LIB_SPEC) |