From owner-svn-ports-all@FreeBSD.ORG Mon Jun 9 21:04:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37033BAD; Mon, 9 Jun 2014 21:04:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A49A2278; Mon, 9 Jun 2014 21:04:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59L4ARp034229; Mon, 9 Jun 2014 21:04:10 GMT (envelope-from mi@svn.freebsd.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59L4AnI034227; Mon, 9 Jun 2014 21:04:10 GMT (envelope-from mi@svn.freebsd.org) Message-Id: <201406092104.s59L4AnI034227@svn.freebsd.org> From: Mikhail Teterin Date: Mon, 9 Jun 2014 21:04:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357206 - head/graphics/libimg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 21:04:11 -0000 Author: mi Date: Mon Jun 9 21:04:10 2014 New Revision: 357206 URL: http://svnweb.freebsd.org/changeset/ports/357206 QAT: https://qat.redports.org/buildarchive/r357206/ Log: Fix plist... Do not link with X-libraries directly -- no calls are made from this software into X11, it is all handled by Tk. Modified: head/graphics/libimg/Makefile head/graphics/libimg/pkg-plist Modified: head/graphics/libimg/Makefile ============================================================================== --- head/graphics/libimg/Makefile Mon Jun 9 20:43:42 2014 (r357205) +++ head/graphics/libimg/Makefile Mon Jun 9 21:04:10 2014 (r357206) @@ -40,8 +40,13 @@ post-patch: .endfor post-configure: + # Do not link with X11 -- none of tkimg code uses X directly + ${REINPLACE_CMD} -E -e 's,-L[^[:space:]]+[[:space:]]+-lX[^[:space:]]*,,g' \ + ${WRKSRC}/*/Makefile .for l in jpeg png tiff - ${REINPLACE_CMD} -E -e 's,^SHLIB_LD_LIBS[[:space:]]*=[[:space:]]*(.*),SHLIB_LD_LIBS=\1 -l$l,' \ + # Link with -l$l + ${REINPLACE_CMD} -E \ + -e 's,^SHLIB_LD_LIBS[[:space:]]*=[[:space:]]*(.*),SHLIB_LD_LIBS=\1 -l$l,' \ -e 's,-lpng$$,-lpng15,' ${WRKSRC}/$l/Makefile .endfor Modified: head/graphics/libimg/pkg-plist ============================================================================== --- head/graphics/libimg/pkg-plist Mon Jun 9 20:43:42 2014 (r357205) +++ head/graphics/libimg/pkg-plist Mon Jun 9 21:04:10 2014 (r357206) @@ -28,3 +28,26 @@ man/mann/img-window.n.gz man/mann/img-xbm.n.gz man/mann/img-xpm.n.gz man/mann/img.n.gz +lib/Img/libtkimg142.so.1 +lib/Img/libtkimgbmp142.so.1 +lib/Img/libtkimgdted142.so.1 +lib/Img/libtkimggif142.so.1 +lib/Img/libtkimgico142.so.1 +lib/Img/libtkimgjpeg142.so.1 +lib/Img/libtkimgpcx142.so.1 +lib/Img/libtkimgpixmap142.so.1 +lib/Img/libtkimgpng142.so.1 +lib/Img/libtkimgppm142.so.1 +lib/Img/libtkimgps142.so.1 +lib/Img/libtkimgraw142.so.1 +lib/Img/libtkimgsgi142.so.1 +lib/Img/libtkimgstub142.a +lib/Img/libtkimgsun142.so.1 +lib/Img/libtkimgtga142.so.1 +lib/Img/libtkimgxbm142.so.1 +lib/Img/libtkimgtiff142.so.1 +lib/Img/libtkimgwindow142.so.1 +lib/Img/libtkimgxpm142.so.1 +lib/Img/pkgIndex.tcl +lib/Img/tkimgConfig.sh +@dirrm lib/Img