ports/117431: Update port: graphics/ipe Version 6.0pre28 of Ipe that uses QT4

Mon Apr 28 19:10:08 UTC 2008

The following reply was made to PR ports/117431; it has been noted by GNATS.

From: Yuriy Mileyko <ymileyko at gmail.com>
To: bug-followup at FreeBSD.org, yury at cs.duke.edu
Cc:  
Subject: Re: ports/117431: Update port: graphics/ipe Version 6.0pre28 of Ipe that uses QT4
Date: Mon, 28 Apr 2008 14:39:44 -0400

 --7AUc2qLy4jB3hD7Z
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 Attached is the update for the newest version of Ipe, that is
 ipe-6.0pre30

 --7AUc2qLy4jB3hD7Z
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="patch.diff"

 diff -ur /usr/ports/graphics/ipe/Makefile ipe/Makefile
 --- /usr/ports/graphics/ipe/Makefile	2008-04-19 13:50:16.000000000 -0400
 +++ ipe/Makefile	2008-04-28 14:25:29.000000000 -0400
 @@ -6,33 +6,34 @@
  #

  PORTNAME=	ipe
 -PORTVERSION=	6.0.p23
 -PORTREVISION=	2
 +PORTVERSION=	6.0.p30
  CATEGORIES=	graphics
 -MASTER_SITES=	http://ipe.compgeom.org/ \
 -		http://tclab.kaist.ac.kr/~otfried/Ipe/
 +MASTER_SITES=	http://luaforge.net/frs/download.php/2727/
  DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/.p/pre/}
  EXTRACT_SUFX=	-src.tar.gz

  MAINTAINER=	ports at FreeBSD.org
  COMMENT=	Extensible drawing editor

 -BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 -
 -USE_GHOSTSCRIPT_RUN=	yes
 -
  RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 +
  WRKSRC=		${WRKDIR}/${DISTNAME}/src
 -USE_QT_VER=	3
 -MAKE_ENV+=	QTDIR=${QTDIR}
 +USE_QT_VER=	4
 +QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build
 +HAS_CONFIGURE=	yes
 +USE_GHOSTSCRIPT_RUN=	yes
  USE_LDCONFIG=	yes
 -LDCONFIG_DIRS=	%%PREFIX%%/lib
 -MAN1=		figtoipe.1 ipe.1 ipe5toxml.1 ipetoipe.1 ipetopng.1
 +MAN1=		ipe.1 ipe5toxml.1 ipetoipe.1  ipetopng.1
 +
 +OPTIONS=	QVORONOI "Include qvoronoi ipelet (requires qhull)" off

  .include <bsd.port.pre.mk>

 -QTDIR?=		${QT_PREFIX}
 -QMAKE?=		${LOCALBASE}/bin/qmake
 +.if defined(WITH_QVORONOI)
 +LIB_DEPENDS+=	qhull:${PORTSDIR}/math/qhull
 +QHULL_INCLUDE=	${LOCALBASE}/include/qhull
 +PLIST_FILES+=	lib/${PORTNAME}/ipelets/libqvoronoi.so
 +.endif

  pre-fetch:
  .if !defined(WITH_TEXMF_PREFIX)
 @@ -49,22 +50,26 @@
  	@${ECHO} ""
  .endif

 -WITH_BROWSER?=mozilla
 +WITH_BROWSER?=firefox
  WITH_TEXMF_PREFIX?=	${PREFIX}/share/texmf-dist

 -# This is my feeble attempt at making qmake play nice with FreeBSD.
 -# If you change a variable, you _must_ reconfigure.
 -# If it is not on this list, it will _not_ be propagated.
 +# You MUST reconfigure and rebuild this port
 +# whenever you change any knobs or variables
 +pre-configure:
 +.if defined(WITH_QVORONOI)
 +	@${REINPLACE_CMD} -e '6s/^#S/S/' ${WRKSRC}/ipelets/ipelets.pro
 +.else
 +	@${REINPLACE_CMD} -e '6s/^S/#S/' ${WRKSRC}/ipelets/ipelets.pro
 +.endif
 +
  do-configure:
 -	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 -	${QMAKE} -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
 -		"PREFIX=${PREFIX}"  "WWWBROWSER=${WITH_BROWSER}" \
 -		"CC=${CC}" "CXX=${CXX}" "LINK=${CXX}" "LINK_SHLIB=${CXX}" \
 -		"LOCALBASE=${LOCALBASE}" main.pro
 +	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 +	${QMAKE} -unix PREFIX=${PREFIX} WWWBROWSER=${WITH_BROWSER}\
 +	LOCALBASE=${LOCALBASE} PORTNAME=${PORTNAME}\
 +	INCLUDEPATH+=${QHULL_INCLUDE} main.pro

  post-install:
 -	cd ${WRKSRC}/.. && mkdir -p ${DATADIR} && \
 -	sed s@/usr/share/texmf@${WITH_TEXMF_PREFIX}@ \
 +	@cd ${WRKSRC}/.. && ${MKDIR} ${DATADIR} && \
 +	${SED} s@/usr/share/texmf@${WITH_TEXMF_PREFIX}@ \
  	< tetex-fontmap.xml >  	${DATADIR}/fontmap.xml
 -
  .include <bsd.port.post.mk>
 diff -ur /usr/ports/graphics/ipe/distinfo ipe/distinfo
 --- /usr/ports/graphics/ipe/distinfo	2006-01-22 07:34:54.000000000 -0500
 +++ ipe/distinfo	2008-04-18 00:56:11.000000000 -0400
 @@ -1,3 +1,3 @@
 -MD5 (ipe-6.0pre23-src.tar.gz) = 573e3a457cca1d02ee0cd5c5d4ff806f
 -SHA256 (ipe-6.0pre23-src.tar.gz) = d39a66e1682014209cac3774c1407dc2b227d3212389dc82b14b8bb210ac8bd7
 -SIZE (ipe-6.0pre23-src.tar.gz) = 846979
 +MD5 (ipe-6.0pre30-src.tar.gz) = d0b203f1cbda664c76681b79684bde76
 +SHA256 (ipe-6.0pre30-src.tar.gz) = 92a752b11f872a0e94d30d32df9101546f37a0d92277805aac7a43bfbf068c4f
 +SIZE (ipe-6.0pre30-src.tar.gz) = 956982
 Only in /usr/ports/graphics/ipe/files: patch-config-pro
 Only in ipe/files: patch-config.pri
 Only in /usr/ports/graphics/ipe/files: patch-src-include-ipebase-h
 diff -ur /usr/ports/graphics/ipe/pkg-descr ipe/pkg-descr
 --- /usr/ports/graphics/ipe/pkg-descr	2004-01-11 13:17:21.000000000 -0500
 +++ ipe/pkg-descr	2008-04-17 23:26:09.000000000 -0400
 @@ -1,5 +1,7 @@
 -This is a port of Ipe, Otfried Cheong's Interactive Picture Editor.
 -Ipe has a very nice integration of LaTeX text and PostScript drawings.
 +Ipe is a drawing editor for creating figures in PDF or
 +(encapsulated) Postscript format. It supports making
 +small figures for inclusion into LaTeX-documents as well
 +as making multi-page PDF presentations that can be shown
 +on-line with Acrobat Reader.

 -David Bremner
 -bremner at unb.ca
 +WWW: http://tclab.kaist.ac.kr/ipe/
 diff -ur /usr/ports/graphics/ipe/pkg-plist ipe/pkg-plist
 --- /usr/ports/graphics/ipe/pkg-plist	2005-06-24 05:29:44.000000000 -0400
 +++ ipe/pkg-plist	2008-04-18 01:14:39.000000000 -0400
 @@ -1,10 +1,8 @@
 -bin/figtoipe
  bin/ipe
  bin/ipe5toxml
  bin/ipetoipe
  bin/ipetopng
  include/ipebase.h
 -include/ipebase.h.orig
  include/ipebitmap.h
  include/ipecolor.h
  include/ipedoc.h
 @@ -33,26 +31,15 @@
  include/ipeutils.h
  include/ipevisitor.h
  include/ipexml.h
 -lib/ipe/6.0pre23/ipelets/libalign.so
 -lib/ipe/6.0pre23/ipelets/libalign.so.1
 -lib/ipe/6.0pre23/ipelets/libalign.so.1.0
 -lib/ipe/6.0pre23/ipelets/libalign.so.1.0.0
 -lib/ipe/6.0pre23/ipelets/libgoodies.so
 -lib/ipe/6.0pre23/ipelets/libgoodies.so.1
 -lib/ipe/6.0pre23/ipelets/libgoodies.so.1.0
 -lib/ipe/6.0pre23/ipelets/libgoodies.so.1.0.0
 -lib/ipe/6.0pre23/ipelets/libimage.so
 -lib/ipe/6.0pre23/ipelets/libimage.so.1
 -lib/ipe/6.0pre23/ipelets/libimage.so.1.0
 -lib/ipe/6.0pre23/ipelets/libimage.so.1.0.0
 -lib/ipe/6.0pre23/ipelets/libkgon.so
 -lib/ipe/6.0pre23/ipelets/libkgon.so.1
 -lib/ipe/6.0pre23/ipelets/libkgon.so.1.0
 -lib/ipe/6.0pre23/ipelets/libkgon.so.1.0.0
 -lib/ipe/6.0pre23/ipelets/libtemplates.so
 -lib/ipe/6.0pre23/ipelets/libtemplates.so.1
 -lib/ipe/6.0pre23/ipelets/libtemplates.so.1.0
 -lib/ipe/6.0pre23/ipelets/libtemplates.so.1.0.0
 +lib/ipe/ipelets/libalign.so
 +lib/ipe/ipelets/libeuclid.so
 +lib/ipe/ipelets/libgoodies.so
 +lib/ipe/ipelets/libimage.so
 +lib/ipe/ipelets/libkgon.so
 +lib/ipe/ipelets/libmove.so
 +lib/ipe/ipelets/libsmallest-circle.so
 +lib/ipe/ipelets/libtemplates.so
 +lib/ipe/ipelets/libvisibility-polygon.so
  lib/libipe.so
  lib/libipe.so.1
  lib/libipe.so.1.0
 @@ -61,7 +48,10 @@
  lib/libipecanvas.so.1
  lib/libipecanvas.so.1.0
  lib/libipecanvas.so.1.0.0
 -share/ipe/fontmap.xml
 +lib/libipemodel.so
 +lib/libipemodel.so.1
 +lib/libipemodel.so.1.0
 +lib/libipemodel.so.1.0.0
  %%DOCSDIR%%/annotated.html
  %%DOCSDIR%%/blank.png
  %%DOCSDIR%%/class_ipe_a85_source-members.html
 @@ -217,8 +207,6 @@
  %%DOCSDIR%%/class_ipe_undo_page_ins.html
  %%DOCSDIR%%/class_ipe_undo_stack-members.html
  %%DOCSDIR%%/class_ipe_undo_stack.html
 -%%DOCSDIR%%/class_ipe_undo_views-members.html
 -%%DOCSDIR%%/class_ipe_undo_views.html
  %%DOCSDIR%%/class_ipe_vector-members.html
  %%DOCSDIR%%/class_ipe_vector.html
  %%DOCSDIR%%/class_ipe_view-members.html
 @@ -243,9 +231,46 @@
  %%DOCSDIR%%/example5.png
  %%DOCSDIR%%/example6.png
  %%DOCSDIR%%/functions.html
 -%%DOCSDIR%%/functions_enum.html
 +%%DOCSDIR%%/functions_0x62.html
 +%%DOCSDIR%%/functions_0x63.html
 +%%DOCSDIR%%/functions_0x64.html
 +%%DOCSDIR%%/functions_0x65.html
 +%%DOCSDIR%%/functions_0x66.html
 +%%DOCSDIR%%/functions_0x67.html
 +%%DOCSDIR%%/functions_0x68.html
 +%%DOCSDIR%%/functions_0x69.html
 +%%DOCSDIR%%/functions_0x6c.html
 +%%DOCSDIR%%/functions_0x6d.html
 +%%DOCSDIR%%/functions_0x6e.html
 +%%DOCSDIR%%/functions_0x6f.html
 +%%DOCSDIR%%/functions_0x70.html
 +%%DOCSDIR%%/functions_0x72.html
 +%%DOCSDIR%%/functions_0x73.html
 +%%DOCSDIR%%/functions_0x74.html
 +%%DOCSDIR%%/functions_0x76.html
 +%%DOCSDIR%%/functions_0x77.html
 +%%DOCSDIR%%/functions_0x7e.html
  %%DOCSDIR%%/functions_eval.html
  %%DOCSDIR%%/functions_func.html
 +%%DOCSDIR%%/functions_func_0x62.html
 +%%DOCSDIR%%/functions_func_0x63.html
 +%%DOCSDIR%%/functions_func_0x64.html
 +%%DOCSDIR%%/functions_func_0x65.html
 +%%DOCSDIR%%/functions_func_0x66.html
 +%%DOCSDIR%%/functions_func_0x67.html
 +%%DOCSDIR%%/functions_func_0x68.html
 +%%DOCSDIR%%/functions_func_0x69.html
 +%%DOCSDIR%%/functions_func_0x6c.html
 +%%DOCSDIR%%/functions_func_0x6d.html
 +%%DOCSDIR%%/functions_func_0x6e.html
 +%%DOCSDIR%%/functions_func_0x6f.html
 +%%DOCSDIR%%/functions_func_0x70.html
 +%%DOCSDIR%%/functions_func_0x72.html
 +%%DOCSDIR%%/functions_func_0x73.html
 +%%DOCSDIR%%/functions_func_0x74.html
 +%%DOCSDIR%%/functions_func_0x76.html
 +%%DOCSDIR%%/functions_func_0x77.html
 +%%DOCSDIR%%/functions_func_0x7e.html
  %%DOCSDIR%%/functions_type.html
  %%DOCSDIR%%/functions_vars.html
  %%DOCSDIR%%/group__attr.html
 @@ -313,13 +338,22 @@
  %%DOCSDIR%%/struct_ipe_document_1_1_s_properties.html
  %%DOCSDIR%%/struct_ipe_font-members.html
  %%DOCSDIR%%/struct_ipe_font.html
 +%%DOCSDIR%%/struct_ipe_layout-members.html
 +%%DOCSDIR%%/struct_ipe_layout.html
  %%DOCSDIR%%/struct_ipe_pdf_token-members.html
  %%DOCSDIR%%/struct_ipe_pdf_token.html
  %%DOCSDIR%%/struct_ipe_shading-members.html
  %%DOCSDIR%%/struct_ipe_shading.html
 +%%DOCSDIR%%/struct_ipe_style_sheet_1_1_s_title_style-members.html
 +%%DOCSDIR%%/struct_ipe_style_sheet_1_1_s_title_style.html
 +%%DOCSDIR%%/tab_b.gif
 +%%DOCSDIR%%/tab_l.gif
 +%%DOCSDIR%%/tab_r.gif
 +%%DOCSDIR%%/tabs.css
  %%DOCSDIR%%/up.png
 - at dirrm  %%DOCSDIR%%
 - at dirrm lib/ipe/6.0pre23/ipelets
 - at dirrm lib/ipe/6.0pre23
 +%%DATADIR%%/fontmap.xml
 +%%DATADIR%%/ipekeys.xml
 + at dirrm %%DATADIR%%
 + at dirrm %%DOCSDIR%%
 + at dirrm lib/ipe/ipelets
  @dirrm lib/ipe
 - at dirrm share/ipe

 --7AUc2qLy4jB3hD7Z--