From owner-svn-ports-head@FreeBSD.ORG Thu Mar 6 18:54:07 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36F6E461; Thu, 6 Mar 2014 18:54:07 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0A4E8BFE; Thu, 6 Mar 2014 18:54:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26Is6b0048692; Thu, 6 Mar 2014 18:54:06 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26Is6wA048691; Thu, 6 Mar 2014 18:54:06 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201403061854.s26Is6wA048691@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 6 Mar 2014 18:54:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347306 - head/print/pdftk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 18:54:07 -0000 Author: mat Date: Thu Mar 6 18:54:06 2014 New Revision: 347306 URL: http://svnweb.freebsd.org/changeset/ports/347306 QAT: https://qat.redports.org/buildarchive/r347306/ Log: If GCC wasn't built with java support the port couldn't build and BUILD_DEPENDS only made gcc recompile without actually solving the problem. This patch introduces pre-configure target to check for gcc java items and give a meaningful explanation if none found. Changed "-Wl,-rpath" to "LDFLAGS" in REINPLACE as suggested by Gerald Pfeifer here http://docs.freebsd.org/cgi/getmsg.cgi?fetch=606002+0+archive/2013/svn-ports-head/20131208.svn-ports-head PR: 186893 Submitted by: Kozlov Sergey Sponsored by: Absolight Modified: head/print/pdftk/Makefile Modified: head/print/pdftk/Makefile ============================================================================== --- head/print/pdftk/Makefile Thu Mar 6 18:51:17 2014 (r347305) +++ head/print/pdftk/Makefile Thu Mar 6 18:54:06 2014 (r347306) @@ -13,14 +13,6 @@ COMMENT= Simple tool for doing everyday LICENSE= GPLv2 -LIB_DEPENDS= libgcj.so:${PORTSDIR}/lang/${_GCC_PORT} \ - libstdc++.so:${PORTSDIR}/lang/${_GCC_PORT} \ - libgcc_s.so:${PORTSDIR}/lang/${_GCC_PORT} - -BUILD_DEPENDS= gcj${CSUFF}:${PORTSDIR}/lang/${_GCC_PORT} \ - gcjh${CSUFF}:${PORTSDIR}/lang/${_GCC_PORT} \ - cpp${CSUFF}:${PORTSDIR}/lang/${_GCC_PORT} - USE_ZIP= yes # Get GCC version suffix without the dot in USE_GCC @@ -42,11 +34,20 @@ MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSU PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +pre-configure: + @if [ ! -e ${LOCALBASE}/bin/gcj${CSUFF} ]; then \ + ${ECHO_MSG} ""; \ + ${ECHO_MSG} "Can not find gcj${CSUFF}"; \ + ${ECHO_MSG} "Please rebuild ${_GCC_PORT} with java support"; \ + ${ECHO_MSG} ""; \ + exit 1; \ + fi + 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: