summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-toolkits/tix/Makefile14
-rw-r--r--x11-toolkits/tix/files/patch-aa79
-rw-r--r--x11-toolkits/tix/files/patch-ab27
-rw-r--r--x11-toolkits/tix/files/patch-ac52
-rw-r--r--x11-toolkits/tix/files/patch-ad10
-rw-r--r--x11-toolkits/tix/pkg-plist10
6 files changed, 142 insertions, 50 deletions
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 0133b957df46..d07b3812b266 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -9,7 +9,7 @@
DISTNAME= Tix4.1.0.007
PKGNAME= tix-4.1.0.007
CATEGORIES= x11-toolkits tk82
-MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/%SUBDIR%/ \
+MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/%SUBDIR%/ \
ftp://ftp.riken.go.jp/pub/lang/tcl/netsoft/%SUBDIR%/
MASTER_SITE_SUBDIR= sorted/packages-8.0/x11/Tix/4.1.0.007
@@ -17,8 +17,6 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
-BROKEN= "Bus error (core dumped) with tk82"
-
WRKSRC= ${WRKDIR}/Tix4.1.0.007/unix/tk8.0
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --enable-sam \
@@ -36,14 +34,12 @@ MANN= BtnBox.n Balloon.n ChkList.n Destroy.n ComboBox.n Control.n \
Select.n StdBBox.n TixIntro.n Tree.n Utils.n Wm.n compound.n \
pixmap.n tix.n
-TIX_LIB= libtix4180.so
-TIXSAM_LIB= libtixsam4180.so
+TIX_LIB= libtix4182.so
+TIXSAM_LIB= libtixsam4182.so
+CFLAGS+= -fwritable-strings
.include <bsd.port.pre.mk>
-TIX_LIB_FILE= ${TIX_LIB}.1
-TIXSAM_LIB_FILE=${TIXSAM_LIB}.1
-
pre-configure:
@(cd ${WRKSRC}/.. && \
CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
@@ -54,7 +50,7 @@ pre-configure:
post-install:
@(cd ${WRKSRC}/.. && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
- ${LN} -fs ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish
+ ${LN} -fs ${PREFIX}/bin/tixwish4.1.8.2 ${PREFIX}/bin/tixwish
${LN} -fs ${TIX_LIB_FILE} ${PREFIX}/lib/${TIX_LIB}
${LN} -fs ${TIXSAM_LIB_FILE} ${PREFIX}/lib/${TIXSAM_LIB}
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index d376cc882950..705c7b177962 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,5 +1,26 @@
---- configure.orig Sun Feb 14 21:20:06 1999
-+++ configure Wed Nov 3 14:21:25 1999
+--- configure.orig Mon Feb 15 04:20:06 1999
++++ configure Sun Dec 5 07:03:17 1999
+@@ -14,9 +14,9 @@
+ ac_help="$ac_help
+ --enable-gcc allow use of gcc if available"
+ ac_help="$ac_help
+- --with-tcl=DIR use Tcl 8.0 source from DIR"
++ --with-tcl=DIR use Tcl 8.2 source from DIR"
+ ac_help="$ac_help
+- --with-tk=DIR use Tk 8.0 source from DIR"
++ --with-tk=DIR use Tk 8.2 source from DIR"
+ ac_help="$ac_help
+ --enable-sam build stand-alone modules"
+ ac_help="$ac_help
+@@ -512,7 +512,7 @@
+ TIX_MAJOR_VERSION=4
+ TIX_MINOR_VERSION=1
+
+-BIN_VERSION=${TIX_VERSION}.8.0
++BIN_VERSION=${TIX_VERSION}.8.2
+
+
+ VERSION=${BIN_VERSION}
@@ -1006,13 +1006,14 @@
if test "$val" != ""; then
@@ -17,7 +38,14 @@
TCL_SRC_DIR="no-no"
for i in $dirs; do
if test -d $i; then
-@@ -1028,7 +1029,7 @@
+@@ -1022,13 +1023,13 @@
+
+ if test ! -d $TCL_SRC_DIR; then
+ { echo "configure: error: Cannot locate Tcl source directory in $dirs" 1>&2; exit 1; }
+- { echo "configure: error: Please install the source code of Tcl 8.0" 1>&2; exit 1; }
++ { echo "configure: error: Please install the source code of Tcl 8.2" 1>&2; exit 1; }
+ exit 1
+ fi
fi
echo "$ac_t""$TCL_SRC_DIR" 1>&6
@@ -43,7 +71,14 @@
TK_SRC_DIR="no-no"
for i in $dirs; do
if test -d $i; then
-@@ -1070,7 +1072,7 @@
+@@ -1064,13 +1066,13 @@
+
+ if test ! -d $TK_SRC_DIR; then
+ { echo "configure: error: Cannot locate Tk source directory in $dirs" 1>&2; exit 1; }
+- { echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; }
++ { echo "configure: error: Please install the source code of Tk 8.2" 1>&2; exit 1; }
+ exit 1
+ fi
fi
echo "$ac_t""$TK_SRC_DIR" 1>&6
@@ -62,7 +97,7 @@
TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}"
TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}"
TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}"
-+ LIBVERSION="${VERSION}"
++ LIB_VERSION="${VERSION}"
else
- TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`"
+ TIX_BUILD_LIB_SPEC="`pwd`/libtix`echo ${VERSION} | tr -d .`.so.1"
@@ -70,11 +105,11 @@
TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`"
TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`"
TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`"
-+ LIB_VERSION="`echo ${VERSION} | tr -d .`"
++ LIB_VERSION="`echo ${VERSION} | tr -d .`"
fi
#--------------------------------------------------------------------
-@@ -1173,7 +1177,7 @@
+@@ -1173,25 +1177,25 @@
# The main Tix library
#
@@ -83,7 +118,19 @@
TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
# The Tcl SAM library
-@@ -1191,7 +1195,7 @@
+ #
+- VERSION=8.0
++ VERSION=8.2
+ eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}"
+ TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}"
+
+ # The Tk SAM library
+ #
+- VERSION=8.0
++ VERSION=8.2
+ eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}"
+ TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}"
+
# The Tix SAM library
#
VERSION=${BIN_VERSION}
@@ -92,6 +139,22 @@
TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}"
else
+@@ -1204,13 +1208,13 @@
+
+ # The Tcl SAM library
+
+- VERSION=8.0
++ VERSION=8.2
+ eval "TCL_SAM_FILE=libtclsam${TCL_UNSHARED_LIB_SUFFIX}"
+ TCL_MAKE_SAM="ar cr ${TCL_SAM_FILE} \${TCL_SAM_OBJS}"
+
+ # The Tk SAM library
+ #
+- VERSION=8.0
++ VERSION=8.2
+ eval "TK_SAM_FILE=libtksam${TCL_UNSHARED_LIB_SUFFIX}"
+ TK_MAKE_SAM="ar cr ${TK_SAM_FILE} \${TK_SAM_OBJS}"
+
@@ -1653,15 +1657,15 @@
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
s%@DL_LIBS@%$DL_LIBS%g
diff --git a/x11-toolkits/tix/files/patch-ab b/x11-toolkits/tix/files/patch-ab
index 2c171fb6502c..4f1522890f89 100644
--- a/x11-toolkits/tix/files/patch-ab
+++ b/x11-toolkits/tix/files/patch-ab
@@ -1,5 +1,5 @@
---- ../Makefile.in.orig Thu Mar 18 11:44:17 1999
-+++ ../Makefile.in Wed Nov 3 14:35:27 1999
+--- ../Makefile.in.orig Wed Jul 9 22:33:48 1997
++++ ../Makefile.in Wed Oct 1 12:03:37 1997
@@ -28,7 +28,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
@@ -18,26 +18,3 @@
install-headers:
@for i in $(INCLUDE_DIR); \
-@@ -219,12 +219,20 @@
- else true; \
- fi; \
- done;
-- @cd $(MANUAL_DIR); for i in *.n *.1; \
-+ @cd $(MANUAL_DIR); for i in *.1; \
-+ do \
-+ echo "Installing doc/$$i"; \
-+ rm -f $(MAN1_DIR)/$$i; \
-+ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-+ $$i > $(MAN1_DIR)/$$i; \
-+ chmod 444 $(MAN1_DIR)/$$i; \
-+ done;
-+ @cd $(MANUAL_DIR); for i in *.n; \
- do \
- echo "Installing doc/$$i"; \
- rm -f $(MANN_DIR)/$$i; \
- sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-- $$i > $(MANN_DIR)/$$i; \
-+ $$i > $(MANN_DIR)/$$i; \
- chmod 444 $(MANN_DIR)/$$i; \
- done;
-
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 8de6caceb052..a581effc90c0 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,5 +1,14 @@
---- Makefile.in.orig Thu Feb 11 11:11:46 1999
-+++ Makefile.in Wed Nov 3 14:25:19 1999
+--- Makefile.in.orig Thu Feb 11 18:11:46 1999
++++ Makefile.in Sun Dec 5 07:04:11 1999
+@@ -1,7 +1,7 @@
+ # Makefile --
+ #
+ # This file is a Makefile to compile Tix with Tk version
+-# 8.0. If it has the name "Makefile.in" then it is a
++# 8.2. If it has the name "Makefile.in" then it is a
+ # template for a Makefile; to generate the actual Makefile, run
+ # "./configure", which is a configuration script generated by the
+ # "autoconf" program (constructs like "@foo@" will get replaced in the
@@ -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
@@ -9,7 +18,20 @@
# Directory in which to install the archive libtix.a:
LIB_DIR = $(exec_prefix)/lib
-@@ -70,16 +70,16 @@
+@@ -59,27 +59,27 @@
+ # determine which shell to use for executing commands:
+ SHELL = /bin/sh
+
+-# Location of the Tcl 8.0 source directory.
++# Location of the Tcl 8.2 source directory.
+ #
+ TCL_SRC_DIR = @TCL_SRC_DIR@
+ TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic
+
+-# Location of the Tk 8.0 source directory.
++# Location of the Tk 8.2 source directory.
+ #
+ TK_SRC_DIR = @TK_SRC_DIR@
TK_GENERIC_DIR = $(TK_SRC_DIR)/generic
# Libraries to use when linking:
@@ -32,6 +54,21 @@
#----------------------------------------------------------------
+@@ -117,10 +117,10 @@
+ TK_SAMEXE_FILE = @TK_SAMEXE_FILE@
+ TIX_SAMEXE_FILE = @TIX_SAMEXE_FILE@
+
+-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
+-INST_TCL_SAMEXE = $(TCL_SAMEXE_FILE)8.0
++INST_EXE = $(TIX_EXE_FILE)$(TIX_VERSION).8.2$(ITCL_EXT)
++INST_TIX_SAMEXE = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.2$(ITCL_EXT)
++INST_TK_SAMEXE = $(TK_SAMEXE_FILE)8.2
++INST_TCL_SAMEXE = $(TCL_SAMEXE_FILE)8.2
+
+ SAM_TARGETS = $(TIX_SAM_FILE)
+
@@ -210,30 +210,30 @@
# scripts of TK must be included in the fixed order.
#----------------------------------------------------------------------
@@ -85,3 +122,12 @@
TIX_SCRIPTS = \
$(SRC_DIR)/library/pref/*.fsc \
+@@ -372,7 +372,7 @@
+ $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixImgXpm.c
+
+ tixInit.o: $(GENERIC_DIR)/tixInit.c
+- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixInit.c
++ $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixInit.c -DTIX_LIBRARY=\"$(TIX_LIBRARY)\"
+
+ tixItcl.o: $(GENERIC_DIR)/tixItcl.c
+ $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixItcl.c
diff --git a/x11-toolkits/tix/files/patch-ad b/x11-toolkits/tix/files/patch-ad
new file mode 100644
index 000000000000..b4f9c5083dba
--- /dev/null
+++ b/x11-toolkits/tix/files/patch-ad
@@ -0,0 +1,10 @@
+--- ../../generic/tixInit.c~ Thu Feb 11 18:11:44 1999
++++ ../../generic/tixInit.c Sun Dec 5 06:46:59 1999
+@@ -537,6 +537,7 @@
+ }\n\
+ set instDir [file dirname [info library]]\n\
+ lappend dirs [tixFileJoin $instDir $lib]\n\
++ lappend dirs " TIX_LIBRARY "\n\
+ lappend dirs [tixFileJoin [tixFileJoin $instDir lib] $lib]\n\
+ catch {\n\
+ lappend dirs [tixFileJoin [tixFileJoin [file dirname [file dirname [info nameofexecutable]]] lib] $lib]\n\
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index fc812a20eb36..149bcd365036 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -1,4 +1,4 @@
-bin/tixwish4.1.8.0
+bin/tixwish4.1.8.2
@exec ln -s %D/%F %B/tixwish
@unexec rm %B/tixwish
include/tix.h
@@ -16,10 +16,10 @@ include/tix/generic/tixPort.h
include/tix/generic/tixTList.h
include/tix/unix/tixUnixInt.h
include/tix/unix/tixUnixPort.h
-lib/libtix4180.so.1
-lib/libtix4180.so
-lib/libtixsam4180.so.1
-lib/libtixsam4180.so
+lib/libtix4182.so.1.2
+lib/libtix4182.so
+lib/libtixsam4182.so.1.2
+lib/libtixsam4182.so
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/tix4.1/bitmaps/act_fold.gif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:59:25 +0000