From owner-svn-ports-all@FreeBSD.ORG Sun Dec 1 22:21:58 2013 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 37CF67BB; Sun, 1 Dec 2013 22:21:58 +0000 (UTC) Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66]) by mx1.freebsd.org (Postfix) with ESMTP id 115521D6B; Sun, 1 Dec 2013 22:21:57 +0000 (UTC) Received: from [192.168.0.132] (vie-91-186-144-213.dsl.sil.at [91.186.144.213]) by ainaz.pair.com (Postfix) with ESMTPSA id E2E653F44E; Sun, 1 Dec 2013 17:21:52 -0500 (EST) Date: Sun, 1 Dec 2013 23:21:51 +0100 (CET) From: Gerald Pfeifer To: Mathieu Arnold , Kozlov Sergey , Greg Larkin Subject: Re: svn commit: r335189 - in head/print/pdftk: . files In-Reply-To: <201311291548.rATFm8g7098382@svn.freebsd.org> Message-ID: References: <201311291548.rATFm8g7098382@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 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: Sun, 01 Dec 2013 22:21:58 -0000 On Fri, 29 Nov 2013, Mathieu Arnold wrote: > Log: > Updated port to pdftk-2.02 : > - Added LIB_DEPENDS. Libraries provided by gcc required to run the binary, > but gcc is registered only as build dependency. Removing the gcc after > installation of pdftk is permitted but breaks pdftk This looks quite dubious since USE_GCC already takes care of registering this run-time dependency. USE_GCC also takes care of the BUILD_DEPENDency, so the pre-existing entry there also is unnecessary. > maintainer timeout. This reminds me, I had submitted another patch in August 2012 (per mail, not PR). The -Wl,-path magic is not necessary and manually constructing the path to the GCC run-time libraries is A Bad Idea[TM]. This is what ${LDFLAGS} is there for, and what the second, and more important hunk, in my patch below does. Can you guys please give the patch below a spin and review? (Greg, explicit approval is preferred.) Thanks, Gerald Index: Makefile =================================================================== --- Makefile (revision 335437) +++ Makefile (working copy) @@ -12,14 +12,6 @@ LICENSE= GPLv2 -LIB_DEPENDS= libgcj.so:${PORTSDIR}/lang/gcc${CSUFF} \ - libstdc++.so:${PORTSDIR}/lang/gcc${CSUFF} \ - libgcc_s.so:${PORTSDIR}/lang/gcc${CSUFF} - -BUILD_DEPENDS= gcj${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \ - gcjh${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \ - cpp${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} - USE_ZIP= yes # Get GCC version suffix without the dot in USE_GCC @@ -44,8 +36,8 @@ post-patch: @${REINPLACE_CMD} -e "s|TOOLPATH=|TOOLPATH=${LOCALBASE}/bin/|g" ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e "s|VERSUFF=|VERSUFF=${CSUFF}|g" ${WRKSRC}/${MAKEFILE} - @${REINPLACE_CMD} -e "s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" ${WRKSRC}/${MAKEFILE} - @${REINPLACE_CMD} -e "s|LDLIBS= -lgcj|LDLIBS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} ${ICONV_LIB} -lz -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" \ + @${REINPLACE_CMD} -e "s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib ${LDFLAGS} -w|g" ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e "s|LDLIBS= -lgcj|LDLIBS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} ${ICONV_LIB} -lz -L${LOCALBASE}/lib ${LDFLAGS} -w|g" \ ${WRKSRC}/${MAKEFILE} do-install: