Date: Tue, 23 Oct 2007 18:12:10 GMT From: Yuriy Mileyko <yury@cs.duke.edu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/117431: Update port: graphics/ipe Version 6.0pre28 of Ipe that uses QT4 Message-ID: <200710231812.l9NICACQ015943@www.freebsd.org> Resent-Message-ID: <200710231820.l9NIK1TK085649@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117431 >Category: ports >Synopsis: Update port: graphics/ipe Version 6.0pre28 of Ipe that uses QT4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 23 18:20:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Yuriy Mileyko >Release: 6.2 >Organization: Duke University >Environment: >Description: Update port: graphics/ipe Version 6.0pre28 of Ipe that uses QT4 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/graphics/ipe/Makefile ipe/Makefile --- /usr/ports/graphics/ipe/Makefile Mon Sep 24 05:44:35 2007 +++ ipe/Makefile Fri Aug 10 15:21:22 2007 @@ -1,41 +1,48 @@ # New ports collection makefile for: Ipe -# Date created: October 25 2000 -# Whom: bremner@unb.ca +# Date created: August 8 2007 +# Whom: ymileyko@gmail.com # -# $FreeBSD: ports/graphics/ipe/Makefile,v 1.22 2007/09/24 09:44:35 rafan Exp $ +# $FreeBSD$ # PORTNAME= ipe -PORTVERSION= 6.0.p23 -PORTREVISION= 1 +PORTVERSION= 6.0.p28 CATEGORIES= graphics -MASTER_SITES= http://ipe.compgeom.org/ \ - http://tclab.kaist.ac.kr/~otfried/Ipe/ +MASTER_SITES= http://tclab.kaist.ac.kr/ipe/ DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/} EXTRACT_SUFX= -src.tar.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ymileyko@gmail.com 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_XLIB= yes +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 +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_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes + @${ECHO} "" + @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO} " AFPL Postscript interpreter instead of GNU one" + @${ECHO} "" +.endif + .if !defined(WITH_TEXMF_PREFIX) @${ECHO} "" @${ECHO} " Define WITH_TEXMF_PREFIX=somewhere" @@ -53,19 +60,23 @@ WITH_BROWSER?=mozilla 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 -urN /usr/ports/graphics/ipe/distinfo ipe/distinfo --- /usr/ports/graphics/ipe/distinfo Sun Jan 22 07:34:54 2006 +++ ipe/distinfo Thu Aug 9 03:47:45 2007 @@ -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.0pre28-src.tar.gz) = b0b7d0c935b9687984d2f28b1c8b7226 +SHA256 (ipe-6.0pre28-src.tar.gz) = f567973352400d2a4fddda3e5e724bf05ede1e5f6ab9e6b91cbf79c472566e55 +SIZE (ipe-6.0pre28-src.tar.gz) = 960391 diff -urN /usr/ports/graphics/ipe/files/patch-config-pro ipe/files/patch-config-pro --- /usr/ports/graphics/ipe/files/patch-config-pro Fri Jun 24 05:29:45 2005 +++ ipe/files/patch-config-pro Wed Dec 31 19:00:00 1969 @@ -1,47 +0,0 @@ ---- config.pro.orig Mon Nov 22 06:08:19 2004 -+++ config.pro Wed Jun 22 14:30:39 2005 -@@ -8,7 +8,7 @@ - # Freetype location - # - # Path to "ft2build.h" (if not on standard include path) --FREETYPE_INCLUDE = /usr/include/freetype2 -+FREETYPE_INCLUDE = $${LOCALBASE}/include/freetype2 - # Path to "libfreetype.so" (if not in a standard library directory) - #FREETYPE_LIBS = /usr/lib - # -------------------------------------------------------------------- -@@ -53,6 +53,7 @@ - #IPEPREFIX = /usr - #IPEPREFIX = /opt/ipe-6.0 - # -+IPEPREFIX=$${PREFIX} - isEmpty( IPEPREFIX ) { - error( "You need to specify IPEPREFIX!") - } -@@ -76,7 +77,7 @@ - # IPEDOCDIR will contain the Ipe documentation (mostly html files) - # - isEmpty( IPEDOCDIR ) { -- IPEDOCDIR = $${IPEPREFIX}/share/ipe/$${IPEVERS}/doc -+ IPEDOCDIR = $${IPEPREFIX}/share/doc/ipe - } - # - # IPELANGDIR will contain Ipe UI translations (none exist yet) -@@ -85,15 +86,15 @@ - # - # IPEMANDIR will contain the Ipe manual pages - # --IPEMANDIR = $${IPEPREFIX}/share/man/man1 -+IPEMANDIR = $${IPEPREFIX}/man/man1 - # - # The full path to the Ipe fontmap - # --IPEFONTMAP = $${IPEPREFIX}/share/ipe/$${IPEVERS}/fontmap.xml -+IPEFONTMAP = $${IPEPREFIX}/share/ipe/fontmap.xml - # - # The HTML browser started to read the on-line Ipe documentation. - # (not used if compiled against KDE) --IPEBROWSER = mozilla -+IPEBROWSER = $${WWWBROWSER} - # -------------------------------------------------------------------- - # Standard definitions --- don't change - CONFIG += warn_on release diff -urN /usr/ports/graphics/ipe/files/patch-config.pri ipe/files/patch-config.pri --- /usr/ports/graphics/ipe/files/patch-config.pri Wed Dec 31 19:00:00 1969 +++ ipe/files/patch-config.pri Wed Aug 8 17:51:43 2007 @@ -0,0 +1,64 @@ +--- config.pri.orig Wed Aug 8 01:56:20 2007 ++++ config.pri Wed Aug 8 17:49:06 2007 +@@ -8,7 +8,7 @@ + # Freetype location + # + # Path to "ft2build.h" (if not on standard include path) +-FREETYPE_INCLUDE = /usr/include/freetype2 ++FREETYPE_INCLUDE = $${LOCALBASE}/include/freetype2 + # Path to "libfreetype.so" (if not in a standard library directory) + #FREETYPE_LIBPATH = /usr/lib + # -------------------------------------------------------------------- +@@ -39,6 +39,7 @@ + #IPEPREFIX = /usr + #IPEPREFIX = /opt/ipe-6.0 + # ++IPEPREFIX=$${PREFIX} + !win32:isEmpty( IPEPREFIX ) { + error( "You need to specify IPEPREFIX!") + } +@@ -53,7 +54,7 @@ + IPEHEADERDIR = $${IPEPREFIX}/include + # + # Where Ipelets will be installed: +-IPELETDIR = $${IPEPREFIX}/lib/ipe/$${IPEVERS}/ipelets ++IPELETDIR = $${IPEPREFIX}/lib/$${PORTNAME}/ipelets + # + # List of paths where Ipe will search for Ipelets: + # (Paths are separated by ":" on Windows and ";" on Unix) +@@ -62,29 +63,29 @@ + # IPEDOCDIR will contain the Ipe documentation (mostly html files) + # + isEmpty( IPEDOCDIR ) { +- IPEDOCDIR = $${IPEPREFIX}/share/ipe/$${IPEVERS}/doc ++ IPEDOCDIR = $${IPEPREFIX}/share/doc/$${PORTNAME} + } + # + # IPELANGDIR will contain Ipe UI translations (none exist yet) + # +-IPELANGDIR = $${IPEPREFIX}/share/ipe/$${IPEVERS}/languages ++IPELANGDIR = $${IPEPREFIX}/share/$${PORTNAME}/languages + # + # IPEMANDIR will contain the Ipe manual pages + # +-IPEMANDIR = $${IPEPREFIX}/share/man/man1 ++IPEMANDIR = $${IPEPREFIX}/man/man1 + # + # The full path to the Ipe fontmap + # +-IPEFONTMAP = $${IPEPREFIX}/share/ipe/$${IPEVERS}/fontmap.xml ++IPEFONTMAP = $${IPEPREFIX}/share/$${PORTNAME}/fontmap.xml + # + # The standard key assignment of Ipe + # +-IPEKEYSFILEDIR = $${IPEPREFIX}/share/ipe/$${IPEVERS} ++IPEKEYSFILEDIR = $${IPEPREFIX}/share/$${PORTNAME} + IPEKEYSFILE = $${IPEKEYSFILEDIR}/ipekeys.xml + # + # The HTML browser started to read the on-line Ipe documentation. + # +-IPEBROWSER = mozilla ++IPEBROWSER = $${WWWBROWSER} + # + # -------------------------------------------------------------------- + # Standard definitions --- don't change diff -urN /usr/ports/graphics/ipe/files/patch-src-include-ipebase-h ipe/files/patch-src-include-ipebase-h --- /usr/ports/graphics/ipe/files/patch-src-include-ipebase-h Fri Jun 24 05:29:45 2005 +++ ipe/files/patch-src-include-ipebase-h Wed Dec 31 19:00:00 1969 @@ -1,17 +0,0 @@ ---- include/ipebase.h~ Mon Nov 22 06:08:14 2004 -+++ include/ipebase.h Wed Apr 13 11:45:54 2005 -@@ -43,10 +43,13 @@ - - typedef unsigned char uchar; - --#ifdef WIN32 -+#if defined(WIN32) || defined(__FreeBSD__) - typedef unsigned short ushort; - typedef unsigned int uint; - typedef unsigned long int ulong; -+#endif -+ -+#ifdef WIN32 - #if defined(IPE_MAKEDLL) /* create a DLL library */ - #define IPE_EXPORT __declspec(dllexport) - #else diff -urN /usr/ports/graphics/ipe/pkg-descr ipe/pkg-descr --- /usr/ports/graphics/ipe/pkg-descr Sun Jan 11 13:17:21 2004 +++ ipe/pkg-descr Fri Aug 10 14:06:21 2007 @@ -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@unb.ca +WWW: http://tclab.kaist.ac.kr/ipe/ diff -urN /usr/ports/graphics/ipe/pkg-plist ipe/pkg-plist --- /usr/ports/graphics/ipe/pkg-plist Fri Jun 24 05:29:44 2005 +++ ipe/pkg-plist Fri Aug 10 14:49:09 2007 @@ -4,7 +4,6 @@ bin/ipetoipe bin/ipetopng include/ipebase.h -include/ipebase.h.orig include/ipebitmap.h include/ipecolor.h include/ipedoc.h @@ -33,26 +32,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 +49,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 +208,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 +232,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 +339,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 -@dirrm %%DOCSDIR%% -@dirrm lib/ipe/6.0pre23/ipelets -@dirrm lib/ipe/6.0pre23 +%%DATADIR%%/fontmap.xml +%%DATADIR%%/ipekeys.xml +@dirrm %%DATADIR%% +@dirrm %%DOCSDIR%% +@dirrm lib/ipe/ipelets @dirrm lib/ipe -@dirrm share/ipe >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710231812.l9NICACQ015943>