From owner-freebsd-ports Mon Oct 5 13:04:33 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id NAA19006 for freebsd-ports-outgoing; Mon, 5 Oct 1998 13:04:33 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from shire.domestic.de (kuebart.stuttgart.netsurf.de [194.233.216.182]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA18957; Mon, 5 Oct 1998 13:04:17 -0700 (PDT) (envelope-from joki@kuebart.stuttgart.netsurf.de) Received: from yacht.domestic.de (yacht.domestic.de [192.168.1.4]) by shire.domestic.de (8.8.8/8.8.7) with ESMTP id HAA22191; Mon, 5 Oct 1998 07:40:46 +0200 (CEST) (envelope-from joki@shire.domestic.de) From: Joachim Kuebart Received: (from joki@localhost) by yacht.domestic.de (8.9.1/8.8.7) id HAA08245; Mon, 5 Oct 1998 07:44:37 +0200 (CEST) (envelope-from joki@shire.domestic.de) Message-Id: <199810050544.HAA08245@yacht.domestic.de> Subject: Re: ELFization of x11-toolkits/tix In-Reply-To: <199810050339.UAA00775@bubble.didi.com> from Satoshi Asami at "Oct 4, 98 08:39:06 pm" To: asami@FreeBSD.ORG (Satoshi Asami) Date: Mon, 5 Oct 1998 07:44:37 +0200 (CEST) Cc: joki@kuebart.stuttgart.netsurf.de, ports@FreeBSD.ORG X-Mailer: ELM [version 2.4ME+ PL32 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Satoshi Asami wrote: > * I hope this patch is according to the rules: > > * @exec /sbin/ldconfig -m %B > * @unexec /sbin/ldconfig -R > > You need to change these two lines according to the guidelines too.... :) OK, there you go: Index: Makefile =================================================================== RCS file: /usr/CVS-Repository/ports/x11-toolkits/tix/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 1998/09/25 10:05:14 1.18 +++ Makefile 1998/10/04 18:11:01 @@ -32,6 +32,9 @@ 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 + pre-configure: @(cd ${WRKSRC}/.. && \ CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \ @@ -44,8 +47,10 @@ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) @${MKDIR} ${PREFIX}/man/man1 @mv ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1 - @ln -sf ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish - ${LDCONFIG} -m ${PREFIX}/lib + ${LN} -fs ${PREFIX}/bin/tixwish4.1.8.0 ${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 .for dir in generic unix @${MKDIR} ${PREFIX}/include/tix/${dir} ${INSTALL_DATA} ${WRKSRC}/../../${dir}/*.h ${PREFIX}/include/tix/${dir} @@ -55,3 +60,11 @@ /bin/ln -sf ../../tix.h ${PREFIX}/include/tix/generic .include + +.if ${PORTOBJFORMAT} == "elf" +TIX_LIB_FILE= ${TIX_LIB}.1 +TIXSAM_LIB_FILE=${TIXSAM_LIB}.1 +.else +TIX_LIB_FILE= ${TIX_LIB}.1.2 +TIXSAM_LIB_FILE=${TIXSAM_LIB}.1.2 +.endif Index: patches/patch-aa =================================================================== RCS file: /usr/CVS-Repository/ports/x11-toolkits/tix/patches/patch-aa,v retrieving revision 1.10 diff -u -r1.10 patch-aa --- patch-aa 1998/03/17 07:55:18 1.10 +++ patch-aa 1998/10/04 18:21:33 @@ -1,5 +1,5 @@ --- configure.orig Thu Sep 25 20:32:47 1997 -+++ configure Tue Dec 2 11:39:39 1997 ++++ configure Sun Oct 4 20:21:17 1998 @@ -1060,6 +1060,7 @@ if test "$val" != ""; then @@ -34,36 +34,6 @@ #-------------------------------------------------------------------- # Find out the top level source directory of the Tix package. -@@ -1227,25 +1229,25 @@ - - # The main Tix library - # -- eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" -+ eval "TIX_LIB_FILE=libtix`echo ${VERSION} | tr -d .`.so.1.2" - TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" - - # The Tcl SAM library - # - VERSION=8.0 -- eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}" -+ eval "TCL_SAM_FILE=libtclsam`echo ${VERSION} | tr -d .`.so.1.2" - TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}" - - # The Tk SAM library - # - VERSION=8.0 -- eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}" -+ eval "TK_SAM_FILE=libtksam`echo ${VERSION} | tr -d .`.so.1.2" - TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}" - - # The Tix SAM library - # - VERSION=${BIN_VERSION} -- eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}" -+ eval "TIX_SAM_FILE=libtixsam`echo ${VERSION} | tr -d .`.so.1.2" - TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}" - - else @@ -1707,15 +1709,15 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@DL_LIBS@%$DL_LIBS%g Index: patches/patch-ac =================================================================== RCS file: /usr/CVS-Repository/ports/x11-toolkits/tix/patches/patch-ac,v retrieving revision 1.10 diff -u -r1.10 patch-ac --- patch-ac 1998/03/17 07:55:18 1.10 +++ patch-ac 1998/10/04 18:47:26 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed Sep 24 01:57:18 1997 -+++ Makefile.in Wed Oct 1 13:23:24 1997 +--- Makefile.in.orig Thu Sep 25 20:32:45 1997 ++++ Makefile.in Sun Oct 4 20:47:11 1998 @@ -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 @@ -32,7 +32,7 @@ #---------------------------------------------------------------- -@@ -210,29 +212,29 @@ +@@ -211,29 +211,29 @@ # scripts of TK must be included in the fixed order. #---------------------------------------------------------------------- @@ -83,3 +83,11 @@ $(SRC_DIR)/generic/tk8.0/console.tcl TIX_SCRIPTS = \ +@@ -247,6 +247,7 @@ + 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]*$$//'` + + $(TCL_SAM_FILE): $(TCL_SAM_OBJS) + rm -f $(TCL_SAM_FILE) Index: pkg/PLIST =================================================================== RCS file: /usr/CVS-Repository/ports/x11-toolkits/tix/pkg/PLIST,v retrieving revision 1.12 diff -u -r1.12 PLIST --- PLIST 1998/08/20 03:41:09 1.12 +++ PLIST 1998/10/05 05:41:27 @@ -17,9 +17,11 @@ include/tix/unix/tixUnixInt.h include/tix/unix/tixUnixPort.h lib/libtix4180.so.1.2 +lib/libtix4180.so lib/libtixsam4180.so.1.2 -@exec /sbin/ldconfig -m %B -@unexec /sbin/ldconfig -R +lib/libtixsam4180.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 share/tix4.1/bitmaps/act_fold.xbm share/tix4.1/bitmaps/act_fold.xpm cu Jo --------------------------------------------------------------------- Pray that there's intelligent life Joachim Kuebart Somewhere up in space Stuttgart, Germany 'Cause there's bugger all down here on earth. --- Monty Python To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message