From lichray@gmail.com  Thu Mar 17 04:31:15 2011
Return-Path: <lichray@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B26E610656D4
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 Mar 2011 04:31:15 +0000 (UTC)
	(envelope-from lichray@gmail.com)
Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A4008FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 17 Mar 2011 04:31:15 +0000 (UTC)
Received: by iwn33 with SMTP id 33so2840221iwn.13
        for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 Mar 2011 21:31:14 -0700 (PDT)
Received: by 10.231.180.94 with SMTP id bt30mr791499ibb.23.1300336274883;
        Wed, 16 Mar 2011 21:31:14 -0700 (PDT)
Received: from compaq.yuetime (c-98-228-191-105.hsd1.il.comcast.net [98.228.191.105])
        by mx.google.com with ESMTPS id 8sm352240iba.38.2011.03.16.21.31.11
        (version=TLSv1/SSLv3 cipher=OTHER);
        Wed, 16 Mar 2011 21:31:14 -0700 (PDT)
Received: by compaq.yuetime (sSMTP sendmail emulation); Wed, 16 Mar 2011 23:31:07 -0500
Message-Id: <4d818e92.4800e70a.0cf7.1505@mx.google.com>
Date: Wed, 16 Mar 2011 23:31:07 -0500
From: Zhihao Yuan <lichray@gmail.com>
Reply-To: Zhihao Yuan <lichray@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: port: graphics/mupdf updated to 0.8.15
X-Send-Pr-Version: 3.113
X-GNATS-Notify: martin.dieringer@gmx.de

>Number:         155625
>Category:       ports
>Synopsis:       port: graphics/mupdf updated to 0.8.15
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bapt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 17 04:40:04 UTC 2011
>Closed-Date:    Fri Apr 08 11:48:04 UTC 2011
>Last-Modified:  Fri Apr  8 11:50:09 UTC 2011
>Originator:     Zhihao Yuan
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Mar 14 02:51:28 CDT 2011 root@compaq.yuetime:/usr/obj/usr/src/sys/HOUKAGO amd64


	
>Description:
	MuPDF(http://mupdf.com/) was updated to 0.8.15 (sorry for the deprecated PR ports/155621). We need to update this port. Note that the memory corruption problem (http://portaudit.freebsd.org/53bde960-356b-11e0-8e81-0022190034c0.html) are fixed in this new version. I tested the PDF file from the original advisory (https://code.google.com/p/sumatrapdf/issues/detail?id=1180&can=1), and valgrind shows no problem with the it. 

	BTW, from version 0.8, upstream includes some manpages. I renamed them to following the naming rule of the corresponding binaries (eg., pdf* -> mu_pdf*, pdf*.1 -> mu_pdf*.1). 
>How-To-Repeat:
	
>Fix:

	

--- patch-mupdf-0.8.15 begins here ---
diff -rupN mupdf.orig/Makefile mupdf/Makefile
--- mupdf.orig/Makefile	2010-10-06 15:31:12.000000000 -0500
+++ mupdf/Makefile	2011-03-16 23:20:12.915538148 -0500
@@ -5,10 +5,11 @@
 # $FreeBSD: ports/graphics/mupdf/Makefile,v 1.10 2010/10/06 20:31:12 pgollucci Exp $
 
 PORTNAME=	mupdf
-PORTVERSION=	0.7
+PORTVERSION=	0.8.15
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mupdf.com/download/
+DISTFILES=	${PORTNAME}-${DISTVERSION}-source.tar.gz
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Lightweight PDF viewer and toolkit
@@ -19,10 +20,11 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/prin
 		openjpeg.2:${PORTSDIR}/graphics/openjpeg
 
 USE_GMAKE=	yes
-MAKE_ARGS+=	build=release prefix=${PREFIX} verbose=1
+MAKE_ARGS+=	build=release prefix=${PREFIX} verbose=1 MANDIR=${PREFIX}/man/man1 APPS_MAN="${MAN1:S@^@apps/man/@}" LIBDIR=${PREFIX}/lib
 USE_XORG=	x11 xext
 USE_GNOME=	pkgconfig
 USE_GCC=	4.2+
+MAN1=		mupdf.1 mu_pdfclean.1 mu_pdfdraw.1 mu_pdfshow.1
 
 MAKE_JOBS_SAFE=	yes
 
@@ -32,13 +34,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's#\(PDF.*_EXE=.*DIR./\)#\1mu_#g' \
 		-e '/install:/,/^$$/ { /-d/d; }' \
-		-e '/install.*bin$$/s/install/$$(BSD_INSTALL_PROGRAM)/' \
-		-e '/install.*lib$$/s/install/$$(BSD_INSTALL_PROGRAM)/' \
-		-e '/install.*include$$/s/install/$$(BSD_INSTALL_DATA)/' \
 		${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's/LAGS :=/LAGS +=/g' \
-		-e 's/-O2//' -e 's/-g//' \
+	${REINPLACE_CMD} -e 's/-O2//' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/Makerules
+pre-install:	.SILENT
+	find . -name pdf\*.1 -exec sh -c 'mv {} $$(dirname {})/mu_$$(basename {})' \;
 
 .include <bsd.port.mk>
diff -rupN mupdf.orig/distinfo mupdf/distinfo
--- mupdf.orig/distinfo	2010-10-06 15:31:12.000000000 -0500
+++ mupdf/distinfo	2011-03-16 21:56:33.027260860 -0500
@@ -1,3 +1,2 @@
-MD5 (mupdf-0.7.tar.gz) = 83adc4d14eb17835df791a9a0d1e8fa9
-SHA256 (mupdf-0.7.tar.gz) = e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6
-SIZE (mupdf-0.7.tar.gz) = 3557621
+SHA256 (mupdf-0.8.15-source.tar.gz) = c9e7acc86c208a854e460cd07c1132039a95df0c21aa5052c4481fb540b0e03e
+SIZE (mupdf-0.8.15-source.tar.gz) = 3837265
--- patch-mupdf-0.8.15 ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Mar 17 04:40:15 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155625 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Mar 17 04:49:58 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: martin.dieringer@gmx.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/155625: port: graphics/mupdf updated to 0.8.15
Date: Thu, 17 Mar 2011 04:40:13 UT

 Maintainer of graphics/mupdf,
 
 Please note that PR ports/155625 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/155625
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Zhihao Yuan <lichray@gmail.com>
To: bug-followup@FreeBSD.org, lichray@gmail.com, martin.dieringer@gmx.de
Cc:  
Subject: Re: ports/155625: port: graphics/mupdf updated to 0.8.15
Date: Thu, 17 Mar 2011 00:27:50 -0500

 --aVD9QWMuhilNxW9f
 Content-Type: multipart/mixed; boundary="k1lZvvs/B4yU6o8G"
 Content-Disposition: inline
 
 
 --k1lZvvs/B4yU6o8G
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 I deleted some post-patches in this PR, since I found that them makes no
 changes for the now version. But I found that some of them are used to
 maximized potability. So I add them back in an updated patch.=20
 
 --=20
 Zhihao Yuan, nickname lichray
 The best way to predict the future is to invent it.
 --------------------------------------------------
 let focus =3D 'computing' in here:
 http://let-in.blogspot.com
 (let (me Program!)):
 http://lichray.blogspot.com
 
 --k1lZvvs/B4yU6o8G
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: attachment; filename="patch-mupdf-0.8.15,1"
 Content-Transfer-Encoding: quoted-printable
 
 diff -rupN mupdf.orig/Makefile mupdf/Makefile
 --- mupdf.orig/Makefile	2010-10-06 15:31:12.000000000 -0500
 +++ mupdf/Makefile	2011-03-17 00:17:31.353574795 -0500
 @@ -5,10 +5,11 @@
  # $FreeBSD: ports/graphics/mupdf/Makefile,v 1.10 2010/10/06 20:31:12 pgoll=
 ucci Exp $
 =20
  PORTNAME=3D	mupdf
 -PORTVERSION=3D	0.7
 +PORTVERSION=3D	0.8.15
  PORTEPOCH=3D	1
  CATEGORIES=3D	graphics
  MASTER_SITES=3D	http://www.mupdf.com/download/
 +DISTFILES=3D	${PORTNAME}-${DISTVERSION}-source.tar.gz
 =20
  MAINTAINER=3D	martin.dieringer@gmx.de
  COMMENT=3D	Lightweight PDF viewer and toolkit
 @@ -19,10 +20,11 @@ LIB_DEPENDS=3D	freetype.9:${PORTSDIR}/prin
  		openjpeg.2:${PORTSDIR}/graphics/openjpeg
 =20
  USE_GMAKE=3D	yes
 -MAKE_ARGS+=3D	build=3Drelease prefix=3D${PREFIX} verbose=3D1
 +MAKE_ARGS+=3D	build=3Drelease prefix=3D${PREFIX} verbose=3D1 MANDIR=3D${PR=
 EFIX}/man/man1 APPS_MAN=3D"${MAN1:S@^@apps/man/@}" LIBDIR=3D${PREFIX}/lib
  USE_XORG=3D	x11 xext
  USE_GNOME=3D	pkgconfig
  USE_GCC=3D	4.2+
 +MAN1=3D		mupdf.1 mu_pdfclean.1 mu_pdfdraw.1 mu_pdfshow.1
 =20
  MAKE_JOBS_SAFE=3D	yes
 =20
 @@ -36,9 +38,10 @@ post-patch:	.SILENT
  		-e '/install.*lib$$/s/install/$$(BSD_INSTALL_PROGRAM)/' \
  		-e '/install.*include$$/s/install/$$(BSD_INSTALL_DATA)/' \
  		${WRKSRC}/Makefile
 -	${REINPLACE_CMD} -e 's/LAGS :=3D/LAGS +=3D/g' \
 -		-e 's/-O2//' -e 's/-g//' \
 +	${REINPLACE_CMD} -e 's/-O2//' \
  		-e 's|/usr/local|${LOCALBASE}|' \
  		${WRKSRC}/Makerules
 +pre-install:	.SILENT
 +	find . -name pdf\*.1 -exec sh -c 'mv {} $$(dirname {})/mu_$$(basename {})=
 ' \;
 =20
  .include <bsd.port.mk>
 diff -rupN mupdf.orig/distinfo mupdf/distinfo
 --- mupdf.orig/distinfo	2010-10-06 15:31:12.000000000 -0500
 +++ mupdf/distinfo	2011-03-16 21:56:33.027260860 -0500
 @@ -1,3 +1,2 @@
 -MD5 (mupdf-0.7.tar.gz) =3D 83adc4d14eb17835df791a9a0d1e8fa9
 -SHA256 (mupdf-0.7.tar.gz) =3D e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae=
 23105f917189e81960a6
 -SIZE (mupdf-0.7.tar.gz) =3D 3557621
 +SHA256 (mupdf-0.8.15-source.tar.gz) =3D c9e7acc86c208a854e460cd07c1132039a=
 95df0c21aa5052c4481fb540b0e03e
 +SIZE (mupdf-0.8.15-source.tar.gz) =3D 3837265
 
 --k1lZvvs/B4yU6o8G--
 
 --aVD9QWMuhilNxW9f
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (FreeBSD)
 
 iQEbBAEBAgAGBQJNgZvWAAoJEDM1qsGtFE5ZYScH9RgbQyXsIbs0MzVdLntW+Heq
 ++e5dZV1dAIyLNhiJLEwb/yhyAk4XTtLPgXAr4GXGpm5fGBEBtnr6LZy8TKH5ryQ
 E3lCbeA2TQ53UmzDrw/HCnreYsuXL+XtpuXV1+nOA35rByv0cUBBa8wg3oI7tY+k
 khapO2TBoJD+MbGmiN09r/Di5UiuLiUMxJ2GPfEeNTHkksjsjyR6erDHG82CZp/p
 cT2y/WVpOgsd+mYiWUrZytuNs/pFd8fjmzdsu97v4Qm6SvCexe9IK5T68zA54mvw
 QxPI0mIyvkChCp3H3C/z6Kk3qcLdR+kjX1YhqKKmMrVEmsghS7IE34AuXle91w==
 =yM7O
 -----END PGP SIGNATURE-----
 
 --aVD9QWMuhilNxW9f--
Responsible-Changed-From-To: miwi->bapt 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Fri Apr 8 11:23:15 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155625 
State-Changed-From-To: feedback->closed 
State-Changed-By: bapt 
State-Changed-When: Fri Apr 8 11:48:03 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155625: commit references a PR
Date: Fri,  8 Apr 2011 11:47:50 +0000 (UTC)

 bapt        2011-04-08 11:47:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/mupdf       Makefile distinfo 
   Log:
   - update to 0.8.15
   - add GOOGLE_CODE macros to MASTER_SITE
   
   PR:             ports/155625
   Submitted by:   Zhihao Yuan <lichray _at_ gmail.com>
   Approved by:    maintainer timeout (>23 days)
   
   Revision  Changes    Path
   1.11      +11 -6     ports/graphics/mupdf/Makefile
   1.8       +2 -3      ports/graphics/mupdf/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
