Date: Fri, 9 Feb 2007 15:20:39 +0800 (CST) From: CHAO Shin <quakelee@cn.freebsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108958: [PATCH] x11-toolkits/blt again Message-ID: <200702090720.l197KdKF034819@tarsier.delphij.net> Resent-Message-ID: <200702090730.l197UCA7055305@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108958
>Category: ports
>Synopsis: [PATCH] x11-toolkits/blt again
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 09 07:30:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: CHAO Shin
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
The FreeBSD Simplified Chinese Project
>Environment:
System: FreeBSD portyard.sysdept.sina.com.cn 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Feb 1 19:02:06 CST 2007 root@portyard.sysdept.sina.com.cn:/usr/obj/usr/src/sys/GX270 i386
>Description:
That is the right way with objformat problem
>How-To-Repeat:
>Fix:
--- patch-blt.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/blt/Makefile,v
retrieving revision 1.46
diff -a -u -r1.46 Makefile
--- Makefile 2 Dec 2006 21:51:03 -0000 1.46
+++ Makefile 9 Feb 2007 06:20:52 -0000
@@ -22,6 +22,9 @@
MAINTAINER= kjc@iijlab.net
COMMENT= A Tk extension (with shared libs)
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:15
+
LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84
WRKSRC= ${WRKDIR}/blt2.4z
@@ -36,7 +39,6 @@
--with-tkincls=${LOCALBASE}/include/tk${TK_VER} \
--x-libraries=${X11BASE}/lib \
--x-includes=${X11BASE}/include
-INSTALLS_SHLIB= yes
TK_VER?= 8.4
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/blt/files/patch-aa,v
retrieving revision 1.13
diff -a -u -r1.13 patch-aa
--- files/patch-aa 22 Oct 2003 10:16:00 -0000 1.13
+++ files/patch-aa 9 Feb 2007 06:34:40 -0000
@@ -1,5 +1,5 @@
---- configure.orig Thu Aug 28 15:41:03 2003
-+++ configure Thu Aug 28 15:49:25 2003
+--- configure.orig Fri Oct 4 13:33:59 2002
++++ configure Fri Feb 9 14:31:19 2007
@@ -1202,7 +1202,7 @@
#
# 1. command line (--with-cflags)
@@ -43,19 +43,17 @@
TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
;;
-@@ -4111,7 +4113,14 @@
- if test "$test_ok" = yes; then
+@@ -4108,10 +4110,11 @@
+ test_ok=no
+ fi
+
+- if test "$test_ok" = yes; then
++ if test $test_ok = "yes" ; then
SHLIB_CFLAGS="-fpic"
SHLIB_LD="ld"
- SHLIB_LD_FLAGS="-Bshareable -x"
-+ if test `objformat` = "elf"; then
-+ SHLIB_LD_FLAGS="-Bshareable -x -soname \$@"
-+ SHLIB_SUFFIX=".so.3"
-+ else
-+ SHLIB_LD_FLAGS="-Bshareable -x"
-+ SHLIB_SUFFIX=".so.3.0"
-+ fi
-+
++ SHLIB_LD_FLAGS="-Bshareable -x -soname \$@"
++ SHLIB_SUFFIX=".so.3"
fi
;;
--- patch-blt.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702090720.l197KdKF034819>