From nobody@FreeBSD.org  Wed Feb 19 12:35:52 2014
Return-Path: <nobody@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 23BA527C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Feb 2014 12:35:52 +0000 (UTC)
Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id E973B11E2
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Feb 2014 12:35:51 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1JCZpS7002591
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Feb 2014 12:35:51 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1JCZpDk002577;
	Wed, 19 Feb 2014 12:35:51 GMT
	(envelope-from nobody)
Message-Id: <201402191235.s1JCZpDk002577@cgiserv.freebsd.org>
Date: Wed, 19 Feb 2014 12:35:51 GMT
From: Kozlov Sergey <kozlov.sergey.404@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] print/pdftk fix minor bugs in port
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186893
>Category:       ports
>Synopsis:       [patch] print/pdftk fix minor bugs in port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 19 12:40:00 UTC 2014
>Closed-Date:    Thu Mar 06 18:54:17 UTC 2014
>Last-Modified:  Thu Mar  6 19:00:00 UTC 2014
>Originator:     Kozlov Sergey
>Release:        9.2-RELEASE-p3
>Organization:
ARC
>Environment:
FreeBSD sonya 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #1: Fri Jan 17 19:43:47 EET 2014     root@sonya:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Fix minor bugs in print/pdftk

Changes:
- Previously USE_GCC didn't add gcc as run dependency (the code was there, but didn't work). GCC is required during for many libraries. Some commit between Dec 5 and Jan 7 solved the problem, so there is no need for LIB_DEPENDS workaround anymore.
- 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). I've tested it, it works.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 341857)
+++ Makefile	(working copy)
@@ -13,14 +13,6 @@
 
 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 @@
 
 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:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 19 12:40:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186893 
State-Changed-From-To: open->closed 
State-Changed-By: mat 
State-Changed-When: Thu Mar 6 18:54:17 UTC 2014 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186893 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186893: commit references a PR
Date: Thu,  6 Mar 2014 18:54:13 +0000 (UTC)

 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:
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
