Date: Tue, 26 Apr 2016 12:42:04 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414047 - in head/graphics/ipe: . files Message-ID: <201604261242.u3QCg4bW093516@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Apr 26 12:42:04 2016 New Revision: 414047 URL: https://svnweb.freebsd.org/changeset/ports/414047 Log: Update to 7.2.2. PR: 209043 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/graphics/ipe/files/patch-include_ipebase.h (contents, props changed) Deleted: head/graphics/ipe/files/patch-include__ipebase.h head/graphics/ipe/files/patch-include__ipedoc.h head/graphics/ipe/files/patch-include__ipereference.h head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp head/graphics/ipe/files/patch-ipelib__Makefile head/graphics/ipe/files/patch-ipelib__ipebitmap.cpp head/graphics/ipe/files/patch-ipelib__ipedct.cpp head/graphics/ipe/files/patch-ipelib__ipegeo.cpp head/graphics/ipe/files/patch-ipelib__ipelatex.cpp head/graphics/ipe/files/patch-ipelib__ipeshape.cpp head/graphics/ipe/files/patch-ipelib_ipeplatform.cpp Modified: head/graphics/ipe/Makefile (contents, props changed) head/graphics/ipe/distinfo (contents, props changed) head/graphics/ipe/pkg-descr (contents, props changed) head/graphics/ipe/pkg-plist (contents, props changed) Modified: head/graphics/ipe/Makefile ============================================================================== --- head/graphics/ipe/Makefile Tue Apr 26 12:29:31 2016 (r414046) +++ head/graphics/ipe/Makefile Tue Apr 26 12:42:04 2016 (r414047) @@ -2,44 +2,36 @@ # $FreeBSD$ PORTNAME= ipe -PORTVERSION= 7.1.7 +PORTVERSION= 7.2.2 DISTVERSIONSUFFIX= -src CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}${PORTVERSION:R:R}/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= https://dl.bintray.com/otfried/generic/ipe/${PORTVERSION:R}/ MAINTAINER= ports@FreeBSD.org COMMENT= Extensible vector graphics editor with LaTeX support -BROKEN= unfetchable - LICENSE= GPLv3+ RUN_DEPENDS= xdg-open:devel/xdg-utils WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= dos2unix gmake iconv jpeg lua:52 pkgconfig -DOS2UNIX_FILES= ipelib/Makefile +USES= compiler:c++11-lib gmake jpeg lua:52 pkgconfig USE_GNOME= cairo -USE_QT4= gui moc_build qmake_build rcc_build uic_build +USE_QT5= widgets buildtools_build qmake_build USE_TEX= pdftex MAKE_ENV= DL_LIBS="" \ - DLL_CFLAGS="-fPIC" \ - ICONV_CFLAGS="-I${ICONV_PREFIX}/include" \ - ICONV_LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" \ INSTALL_DIR="${MKDIR}" \ INSTALL_FILES="${INSTALL_DATA}" \ INSTALL_SCRIPTS="${INSTALL_SCRIPT}" \ INSTALL_PROGRAMS="${INSTALL_PROGRAM}" \ INSTALL_ROOT="${STAGEDIR}" \ - IPE_USE_ICONV="-DIPE_USE_ICONV" \ IPEDOCDIR="${DOCSDIR}" \ IPEMANDIR="${MANPREFIX}/man/man1" \ IPEPREFIX="${PREFIX}" \ JPEG_CFLAGS="-I${LOCALBASE}/include" \ JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \ - LUA_CFLAGS="-I${LUA_INCDIR}" \ - LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" \ + LUA_PACKAGE="lua-${LUA_VER}" \ MOC="${MOC}" USE_LDCONFIG= yes @@ -47,33 +39,21 @@ PLIST_SUB= VERSION="${PORTVERSION}" PORTDOCS= * -DESKTOP_ENTRIES="Ipe" "" "${DATADIR}/${PORTVERSION}/ipe.png" \ - "${PORTNAME}" "" true +DESKTOP_ENTRIES="Ipe" "" "ipe" "ipe" "" "" OPTIONS_DEFINE= DOCS post-patch: - @cd ${WRKSRC}/../fontmaps && ${SED} -e \ - 's|/usr/share|${LOCALBASE}/share| ; \ - s|type1/gsfonts|ghostscirpt/fonts|' \ - < gsfonts-fontmap.xml > fontmap.xml @${REINPLACE_CMD} -e \ 's|^INSTALL_|#INSTALL_| ; \ /-O2/s|^|#|' ${WRKSRC}/common.mak @${REINPLACE_CMD} -e \ 's|\([[:blank:]]\)=|\1?=|' ${WRKSRC}/config.mak @${REINPLACE_CMD} -e \ - '/$$(INSTALL_ROOT)$$(IPEDOCDIR)/s|^|#|' ${WRKSRC}/ipe/Makefile - @${REINPLACE_CMD} -e \ '/%s/s|gnome-open|xdg-open|' ${WRKSRC}/ipe/lua/prefs.lua - @${REINPLACE_CMD} -e \ - 's|QT__H|QT_H|' ${WRKSRC}/ipeui/ipeui_qt.h post-install: - (cd ${WRKSRC}/../fontmaps && ${INSTALL_DATA} fontmap.xml \ - ${STAGEDIR}${DATADIR}/${PORTVERSION}) - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKSRC}/../build/doc && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DOCSDIR}) + @${LN} -sf ${DATADIR}${PORTVERSION}/ipe.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps .include <bsd.port.mk> Modified: head/graphics/ipe/distinfo ============================================================================== --- head/graphics/ipe/distinfo Tue Apr 26 12:29:31 2016 (r414046) +++ head/graphics/ipe/distinfo Tue Apr 26 12:42:04 2016 (r414047) @@ -1,2 +1,2 @@ -SHA256 (ipe-7.1.7-src.tar.gz) = ec670cd7f0fa521271fc54bf9b663570d82280bdbe405be6de59535fec7c00d2 -SIZE (ipe-7.1.7-src.tar.gz) = 1758157 +SHA256 (ipe-7.2.2-src.tar.gz) = a70181492ac2d83546b5c88cb15da382b906d905ea3babe700bf98c822821d68 +SIZE (ipe-7.2.2-src.tar.gz) = 1912583 Added: head/graphics/ipe/files/patch-include_ipebase.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ipe/files/patch-include_ipebase.h Tue Apr 26 12:42:04 2016 (r414047) @@ -0,0 +1,14 @@ +--- include/ipebase.h.orig 2016-01-24 11:16:26 UTC ++++ include/ipebase.h +@@ -51,9 +51,9 @@ + + using uchar = unsigned char; + +-#if defined(WIN32) || defined(__APPLE__) ++// #if defined(WIN32) || defined(__APPLE__) + using uint = unsigned int; +-#endif ++// #endif + + #ifdef WIN32 + #define IPESEP ('\\') Modified: head/graphics/ipe/pkg-descr ============================================================================== --- head/graphics/ipe/pkg-descr Tue Apr 26 12:29:31 2016 (r414046) +++ head/graphics/ipe/pkg-descr Tue Apr 26 12:42:04 2016 (r414047) @@ -3,4 +3,4 @@ Postscript format. It supports making sm into LaTeX-documents as well as making multi-page PDF presentations that can be shown on-line with Acrobat Reader. -WWW: http://ipe7.sourceforge.net/ +WWW: http://ipe.otfried.org/ Modified: head/graphics/ipe/pkg-plist ============================================================================== --- head/graphics/ipe/pkg-plist Tue Apr 26 12:29:31 2016 (r414046) +++ head/graphics/ipe/pkg-plist Tue Apr 26 12:42:04 2016 (r414047) @@ -4,17 +4,16 @@ bin/ipeextract bin/iperender bin/ipescript bin/ipetoipe -bin/ipeview include/ipeattributes.h include/ipebase.h include/ipebitmap.h include/ipecanvas.h +include/ipecanvas_cocoa.h include/ipecanvas_gtk.h include/ipecanvas_qt.h include/ipecanvas_win.h include/ipedoc.h include/ipefactory.h -include/ipefontpool.h include/ipegeo.h include/ipegroup.h include/ipeimage.h @@ -23,6 +22,7 @@ include/ipelatex.h include/ipelet.h include/ipelib.h include/ipeobject.h +include/ipeosx.h include/ipepage.h include/ipepainter.h include/ipepath.h @@ -30,6 +30,8 @@ include/ipepdfparser.h include/ipepdfwriter.h include/ipepswriter.h include/ipereference.h +include/iperesources.h +include/ipeselector_cocoa.h include/ipeselector_qt.h include/ipeshape.h include/ipesnap.h @@ -61,16 +63,32 @@ man/man1/ipeextract.1.gz man/man1/iperender.1.gz man/man1/ipescript.1.gz man/man1/ipetoipe.1.gz -%%DATADIR%%/%%VERSION%%/fontmap.xml %%DATADIR%%/%%VERSION%%/icons/copy.png +%%DATADIR%%/%%VERSION%%/icons/copy@2x.png +%%DATADIR%%/%%VERSION%%/icons/copy_32x32.png +%%DATADIR%%/%%VERSION%%/icons/copy_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/cut.png +%%DATADIR%%/%%VERSION%%/icons/cut@2x.png +%%DATADIR%%/%%VERSION%%/icons/cut_32x32.png +%%DATADIR%%/%%VERSION%%/icons/cut_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/delete.png +%%DATADIR%%/%%VERSION%%/icons/delete@2x.png +%%DATADIR%%/%%VERSION%%/icons/delete_32x32.png +%%DATADIR%%/%%VERSION%%/icons/delete_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/fit_objects.png +%%DATADIR%%/%%VERSION%%/icons/fit_objects@2x.png +%%DATADIR%%/%%VERSION%%/icons/fit_objects_32x32.png +%%DATADIR%%/%%VERSION%%/icons/fit_objects_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/fit_page.png +%%DATADIR%%/%%VERSION%%/icons/fit_page@2x.png +%%DATADIR%%/%%VERSION%%/icons/fit_page_32x32.png +%%DATADIR%%/%%VERSION%%/icons/fit_page_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/fit_width.png %%DATADIR%%/%%VERSION%%/icons/grid_visible.png %%DATADIR%%/%%VERSION%%/icons/ipe.png %%DATADIR%%/%%VERSION%%/icons/keyboard.png +%%DATADIR%%/%%VERSION%%/icons/keyboard@2x.png +%%DATADIR%%/%%VERSION%%/icons/keyboard_32x32.png %%DATADIR%%/%%VERSION%%/icons/mode_arc1.png %%DATADIR%%/%%VERSION%%/icons/mode_arc2.png %%DATADIR%%/%%VERSION%%/icons/mode_arc3.png @@ -78,7 +96,13 @@ man/man1/ipetoipe.1.gz %%DATADIR%%/%%VERSION%%/icons/mode_circle2.png %%DATADIR%%/%%VERSION%%/icons/mode_circle3.png %%DATADIR%%/%%VERSION%%/icons/mode_ink.png +%%DATADIR%%/%%VERSION%%/icons/mode_ink@2x.png +%%DATADIR%%/%%VERSION%%/icons/mode_ink_32x32.png +%%DATADIR%%/%%VERSION%%/icons/mode_ink_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/mode_label.png +%%DATADIR%%/%%VERSION%%/icons/mode_label@2x.png +%%DATADIR%%/%%VERSION%%/icons/mode_label_32x32.png +%%DATADIR%%/%%VERSION%%/icons/mode_label_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/mode_lines.png %%DATADIR%%/%%VERSION%%/icons/mode_marks.png %%DATADIR%%/%%VERSION%%/icons/mode_math.png @@ -94,8 +118,14 @@ man/man1/ipetoipe.1.gz %%DATADIR%%/%%VERSION%%/icons/mode_stretch.png %%DATADIR%%/%%VERSION%%/icons/mode_translate.png %%DATADIR%%/%%VERSION%%/icons/paste.png +%%DATADIR%%/%%VERSION%%/icons/paste@2x.png +%%DATADIR%%/%%VERSION%%/icons/paste_32x32.png +%%DATADIR%%/%%VERSION%%/icons/paste_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/pen.png %%DATADIR%%/%%VERSION%%/icons/redo.png +%%DATADIR%%/%%VERSION%%/icons/redo@2x.png +%%DATADIR%%/%%VERSION%%/icons/redo_32x32.png +%%DATADIR%%/%%VERSION%%/icons/redo_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/shift_key.png %%DATADIR%%/%%VERSION%%/icons/snapangle.png %%DATADIR%%/%%VERSION%%/icons/snapauto.png @@ -105,9 +135,21 @@ man/man1/ipetoipe.1.gz %%DATADIR%%/%%VERSION%%/icons/snapint.png %%DATADIR%%/%%VERSION%%/icons/snapvtx.png %%DATADIR%%/%%VERSION%%/icons/stop.png +%%DATADIR%%/%%VERSION%%/icons/stop@2x.png +%%DATADIR%%/%%VERSION%%/icons/stop_32x32.png +%%DATADIR%%/%%VERSION%%/icons/stop_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/undo.png +%%DATADIR%%/%%VERSION%%/icons/undo@2x.png +%%DATADIR%%/%%VERSION%%/icons/undo_32x32.png +%%DATADIR%%/%%VERSION%%/icons/undo_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/zoom_in.png +%%DATADIR%%/%%VERSION%%/icons/zoom_in@2x.png +%%DATADIR%%/%%VERSION%%/icons/zoom_in_32x32.png +%%DATADIR%%/%%VERSION%%/icons/zoom_in_32x32@2x.png %%DATADIR%%/%%VERSION%%/icons/zoom_out.png +%%DATADIR%%/%%VERSION%%/icons/zoom_out@2x.png +%%DATADIR%%/%%VERSION%%/icons/zoom_out_32x32.png +%%DATADIR%%/%%VERSION%%/icons/zoom_out_32x32@2x.png %%DATADIR%%/%%VERSION%%/lua/actions.lua %%DATADIR%%/%%VERSION%%/lua/editpath.lua %%DATADIR%%/%%VERSION%%/lua/main.lua @@ -124,3 +166,4 @@ man/man1/ipetoipe.1.gz %%DATADIR%%/%%VERSION%%/styles/beamer.isy %%DATADIR%%/%%VERSION%%/styles/colors.isy %%DATADIR%%/%%VERSION%%/styles/presentation.isy +share/pixmaps/ipe.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604261242.u3QCg4bW093516>