From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 21 21:06:31 2007 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5ABA516A417 for ; Fri, 21 Dec 2007 21:06:31 +0000 (UTC) (envelope-from mi+mill@aldan.algebra.com) Received: from mail5.sea5.speakeasy.net (mail5.sea5.speakeasy.net [69.17.117.7]) by mx1.freebsd.org (Postfix) with ESMTP id 1FB0113C447 for ; Fri, 21 Dec 2007 21:06:31 +0000 (UTC) (envelope-from mi+mill@aldan.algebra.com) Received: (qmail 1029 invoked from network); 21 Dec 2007 20:39:51 -0000 Received: from aldan.algebra.com (HELO aldan-mlp) ([216.254.65.224]) (envelope-sender ) by mail5.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 21 Dec 2007 20:39:51 -0000 From: Mikhail Teterin To: yokota@res.otaru-uc.ac.jp Date: Fri, 21 Dec 2007 15:39:47 -0500 User-Agent: KMail/1.7.1 References: <200712202146.lBKLkjE8020213@freefall.freebsd.org> In-Reply-To: <200712202146.lBKLkjE8020213@freefall.freebsd.org> Organization: Virtual Estates, Inc. MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_VSCbHpunm7P0Jln" Message-Id: <200712211539.49389.mi+mill@aldan.algebra.com> Cc: freebsd-ports-bugs@freebsd.org, trash.esiac@gmail.com Subject: Re: ports/118784: [PATCH] print/lyx15: update to 1.5.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Dec 2007 21:06:31 -0000 --Boundary-00=_VSCbHpunm7P0Jln Content-Type: text/plain; charset="koi8-u" Content-Transfer-Encoding: 7bit Content-Disposition: inline Ulrich, how about the attached patch? In addition to upgrade the change Yokota suggested, it also gets rid of the bundled libintl and scales the build with the number of processors in the building machine... Yours, -mi --Boundary-00=_VSCbHpunm7P0Jln Content-Type: text/x-diff; charset="koi8-u"; name="lyx15.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="lyx15.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/print/lyx15/Makefile,v retrieving revision 1.115 diff -U2 -r1.115 Makefile --- Makefile 8 Oct 2007 09:17:06 -0000 1.115 +++ Makefile 21 Dec 2007 20:35:31 -0000 @@ -7,5 +7,5 @@ PORTNAME= lyx -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.3 CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ @@ -23,4 +23,5 @@ BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \ + ${LOCALBASE}/share/texmf/tex/latex/prettyref/prettyref.sty:${PORTSDIR}/print/latex-prettyref \ ${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost @@ -32,8 +33,7 @@ OPTIONS= ASPELL "Utilize ASPELL library" on \ AIKSAUR "Build Aiksaurus support (English thesaurus)" on \ - NLS "Native language support" On \ - INCGT "Use the included Gettext library" off + NLS "Native language support" On -ALL_TARGET= all check +ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` USE_BZIP2= yes USE_GNOME= gnometarget lthack @@ -47,9 +47,11 @@ CONFLICTS= lyx-1.4.* -EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude ${PORTNAME}-${PORTVERSION}/intl/*.[ch] --exclude ${PORTNAME}-${PORTVERSION}/boost -CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \ - --with-extra-inc="${LOCALBASE}/include/Qt* ${LOCALBASE}/include" \ +EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude ${PORTNAME}-${PORTVERSION}/intl/*.[ch] \ + --exclude ${PORTNAME}-${PORTVERSION}/boost --exclude ${PORTNAME}-${PORTVERSION}/intl +CONFIGURE_ARGS= --with-frontend=qt4 \ --without-included-boost \ - --with-frontend=qt4 + --without-included-gettext \ + --with-libiconv-prefix=${LOCALBASE} + MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" @@ -58,5 +60,7 @@ post-patch: # Removing mention of the bundled boost - ${REINPLACE_CMD} -e 's, boost/[^ ]*Makefile,,g' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's, boost/[^ ]*Makefile,,g' -e 's, intl/Makefile,,g' \ + ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's, intl , ,' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's,detail/nullstream,utils/nullstream,' \ ${WRKSRC}/src/pch.h ${WRKSRC}/src/support/pch.h \ @@ -77,4 +81,8 @@ ${REINPLACE_CMD} -e 's,-lc ,,' ${WRKSRC}/*/Makefile +post-build check test: + # Running vendor's self-tests: + ${GMAKE} -C ${WRKSRC} check + .include @@ -101,10 +109,6 @@ .if !defined(WITHOUT_NLS) -.if defined(WITH_INCGT) -CONFIGURE_ARGS+= --with-included-gettext -.else USE_GETTEXT= yes PLIST_SUB+= NLS="" -.endif .else CONFIGURE_ARGS+= --disable-nls @@ -112,3 +116,9 @@ .endif +# includes of qt4 must be found earlier than those of qt3 +CONFIGURE_ENV+= QT4_CORE_CFLAGS="-DQT_SHARED -I${LOCALBASE}/include/QtCore \ + -I${LOCALBASE}/include" \ + QT4_FRONTEND_CFLAGS="-DQT_SHARED -I${LOCALBASE}/include/QtCore \ + -I${LOCALBASE}/include/QtGui -I${LOCALBASE}/include" + .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/print/lyx15/distinfo,v retrieving revision 1.39 diff -U2 -r1.39 distinfo --- distinfo 8 Oct 2007 09:17:06 -0000 1.39 +++ distinfo 21 Dec 2007 20:35:31 -0000 @@ -1,6 +1,3 @@ -MD5 (lyx-1.5.1.tar.gz) = 7a06523d99c27ba5a0baebc5664024ba -SHA256 (lyx-1.5.1.tar.gz) = 9f1000ee9473becb9cc46acdf6517d8182a5f679c18ff623df436d172c068e3a -SIZE (lyx-1.5.1.tar.gz) = 10115219 -MD5 (lyx-1.5.1.tar.bz2) = 0ae3b9ccb2aa74776be4af8c199dbbe9 -SHA256 (lyx-1.5.1.tar.bz2) = d720ff082ed29d385c52e7ad370499d23275e595e9d7a321b383609f68acf23e -SIZE (lyx-1.5.1.tar.bz2) = 7823886 +MD5 (lyx-1.5.3.tar.bz2) = 4fe013248713bb126877c317cad57238 +SHA256 (lyx-1.5.3.tar.bz2) = 5b6d051f243e5595bf8fb56a57ece1b77049d4745bfc3473e2f120b933a41de0 +SIZE (lyx-1.5.3.tar.bz2) = 8743035 --Boundary-00=_VSCbHpunm7P0Jln--