diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index de787297dee..2f476faf63f 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.24 2020/09/14 12:51:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.25 2021/05/08 14:45:02 sthen Exp $ COMMENT = extensible drawing editor -V = 7.2.20 +V = 7.2.24 SUBST_VARS += V DISTNAME = ipe-${V}-src PKGNAME = ipe-${V} # Upstream libraries would be installed as libxxx.so.${V} -SHLIB_VERSION = 3.0 +SHLIB_VERSION = 4.0 SHARED_LIBS += ipe ${SHLIB_VERSION} SHARED_LIBS += ipecairo ${SHLIB_VERSION} @@ -23,12 +23,14 @@ MAINTAINER = Alessandro De Laurenzis # GPLv3+ PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Core Qt5Gui Qt5Widgets -WANTLIB += c cairo freetype gsl gslcblas iconv jpeg m png pthread z +WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Core Qt5Gui Qt5Widgets +WANTLIB += c cairo freetype gsl gslcblas iconv jpeg m png pthread spiro z + +FIX_CRLF_FILES = src/ipeui/Makefile COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES = https://dl.bintray.com/otfried/generic/ipe/${V:R}/ +MASTER_SITES = https://github.com/otfried/ipe/releases/download/v$V/ MODULES = lang/lua \ x11/qt5 @@ -36,33 +38,40 @@ MODULES = lang/lua \ MODLUA_VERSION = 5.3 MODLUA_SA = Yes +BUILD_DEPENDS = devel/doxygen + LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \ ${MODQT5_LIB_DEPENDS} \ - devel/gsl + devel/gsl \ + graphics/libspiro + RUN_DEPENDS = print/texlive/base \ x11/xvkbd MAKE_FLAGS += CXX="${CXX}" \ IPEPREFIX=${PREFIX} \ - IPE_USE_ICONV=-DIPE_USE_ICONV \ - ICONV_CFLAGS=-I${LOCALBASE}/include \ ICONV_LIBS="-L${LOCALBASE}/lib -liconv" \ SHLIB_VERSION=${SHLIB_VERSION} \ - JPEG_CFLAGS=-I${LOCALBASE}/include \ IPEDOCDIR=${PREFIX}/share/doc/ipe \ DL_LIBS="" + MAKE_ENV += PKG_CONFIG_PATH=${LOCALBASE}/lib/qt5/pkgconfig + FAKE_FLAGS += INSTALL_ROOT=${WRKINST} \ SHLIB_VERSION=${SHLIB_VERSION} \ IPEMANDIR=${PREFIX}/man/man1 \ IPEDOCDIR=${PREFIX}/share/doc/ipe USE_GMAKE = Yes + NO_TEST = Yes + UPDATE_PLIST_ARGS += -i MODLUA_DEP_VERSION -WRKDIST = ${WRKDIR}/${PKGNAME} -WRKSRC = ${WRKDIST}/src +WRKDIST = ${WRKDIR}/${PKGNAME} +WRKSRC = ${WRKDIST}/src + +ALL_TARGET = all documentation pre-build: ${SUBST_CMD} ${WRKSRC}/config.mak diff --git a/graphics/ipe/distinfo b/graphics/ipe/distinfo index 8e8e181d462..318713ee4a5 100644 --- a/graphics/ipe/distinfo +++ b/graphics/ipe/distinfo @@ -1,2 +1,2 @@ -SHA256 (ipe-7.2.20-src.tar.gz) = LJOJIlGYBHAA1w0Cvj28z0D9mprm78CWiBTk+NRajTg= -SIZE (ipe-7.2.20-src.tar.gz) = 1876081 +SHA256 (ipe-7.2.24-src.tar.gz) = /rh58k0dziWRB5B3BEbVCwPkbuLr19KBV7FwWXFkT28= +SIZE (ipe-7.2.24-src.tar.gz) = 1031794 diff --git a/graphics/ipe/patches/patch-src_common_mak b/graphics/ipe/patches/patch-src_common_mak index b3aacf18d68..669f02ecb84 100644 --- a/graphics/ipe/patches/patch-src_common_mak +++ b/graphics/ipe/patches/patch-src_common_mak @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_common_mak,v 1.5 2020/09/14 12:51:40 sthen Exp $ +$OpenBSD: patch-src_common_mak,v 1.6 2021/05/08 14:45:02 sthen Exp $ Index: src/common.mak --- src/common.mak.orig +++ src/common.mak -@@ -214,11 +214,10 @@ else +@@ -217,11 +217,10 @@ else CXXFLAGS += -g -O2 DLL_LDFLAGS += -shared PLUGIN_LDFLAGS += -shared diff --git a/graphics/ipe/patches/patch-src_ipe_lua_prefs_lua b/graphics/ipe/patches/patch-src_ipe_lua_prefs_lua index b7d615b7a94..92eb5cd7b1f 100644 --- a/graphics/ipe/patches/patch-src_ipe_lua_prefs_lua +++ b/graphics/ipe/patches/patch-src_ipe_lua_prefs_lua @@ -1,11 +1,11 @@ -$OpenBSD: patch-src_ipe_lua_prefs_lua,v 1.6 2020/09/14 12:51:40 sthen Exp $ +$OpenBSD: patch-src_ipe_lua_prefs_lua,v 1.7 2021/05/08 14:45:02 sthen Exp $ Swapped out the default on-screen keyboard for something lightweight. Index: src/ipe/lua/prefs.lua --- src/ipe/lua/prefs.lua.orig +++ src/ipe/lua/prefs.lua -@@ -329,7 +329,7 @@ elseif config.platform == "apple" then +@@ -343,7 +343,7 @@ elseif config.platform == "apple" then prefs.keyboard = "open -a KeyboardViewer -n" else -- On Linux, you could use: prefs.keyboard = "onboard &" diff --git a/graphics/ipe/patches/patch-src_ipelib_ipeplatform_cpp b/graphics/ipe/patches/patch-src_ipelib_ipeplatform_cpp index 5e56d8741c4..f72ffe1e586 100644 --- a/graphics/ipe/patches/patch-src_ipelib_ipeplatform_cpp +++ b/graphics/ipe/patches/patch-src_ipelib_ipeplatform_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_ipelib_ipeplatform_cpp,v 1.5 2020/09/14 12:51:40 sthen Exp $ +$OpenBSD: patch-src_ipelib_ipeplatform_cpp,v 1.6 2021/05/08 14:45:02 sthen Exp $ Index: src/ipelib/ipeplatform.cpp --- src/ipelib/ipeplatform.cpp.orig @@ -13,7 +13,7 @@ Index: src/ipelib/ipeplatform.cpp #ifdef IPE_GSL #include -@@ -667,6 +670,8 @@ static double ipestrtod(const char *s, char ** fin) +@@ -671,6 +674,8 @@ static double ipestrtod(const char *s, char ** fin) return p_strtod_l(s, fin, ipeLocale); else return strtod(s, fin); diff --git a/graphics/ipe/patches/patch-src_ipepresenter_Makefile b/graphics/ipe/patches/patch-src_ipepresenter_Makefile new file mode 100644 index 00000000000..f05d24a4696 --- /dev/null +++ b/graphics/ipe/patches/patch-src_ipepresenter_Makefile @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_ipepresenter_Makefile,v 1.1 2021/05/08 14:45:02 sthen Exp $ + +Index: src/ipepresenter/Makefile +--- src/ipepresenter/Makefile.orig ++++ src/ipepresenter/Makefile +@@ -10,6 +10,7 @@ TARGET = $(call exe_target,ipepresenter) + + CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \ + $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS) ++CPPFLAGS += $(CXXFLAGS) + LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \ + $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS) + diff --git a/graphics/ipe/patches/patch-src_ipeui_Makefile b/graphics/ipe/patches/patch-src_ipeui_Makefile new file mode 100644 index 00000000000..1c6395c8fbe --- /dev/null +++ b/graphics/ipe/patches/patch-src_ipeui_Makefile @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_ipeui_Makefile,v 1.1 2021/05/08 14:45:02 sthen Exp $ + +Index: src/ipeui/Makefile +--- src/ipeui/Makefile.orig ++++ src/ipeui/Makefile +@@ -11,6 +11,7 @@ SONAME = $(call soname,ipeui) + INSTALL_SYMLINKS = $(call install_symlinks,ipeui) + + CXXFLAGS += $(UI_CFLAGS) $(LUA_CFLAGS) $(DLL_CFLAGS) ++CPPFLAGS += $(CXXFLAGS) + LIBS += $(UI_LIBS) $(LUA_LIBS) + + all: $(TARGET) diff --git a/graphics/ipe/pkg/PLIST b/graphics/ipe/pkg/PLIST index 6c0dc9df565..c5c57687461 100644 --- a/graphics/ipe/pkg/PLIST +++ b/graphics/ipe/pkg/PLIST @@ -1,10 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.6 2020/09/14 12:51:40 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.7 2021/05/08 14:45:02 sthen Exp $ @bin bin/ipe @bin bin/ipe6upgrade bin/ipecurl @bin bin/ipeextract @bin bin/ipepresenter @bin bin/iperender +bin/iperender-par @bin bin/ipescript @bin bin/ipetoipe include/ipeattributes.h @@ -25,7 +26,6 @@ include/ipelatex.h include/ipelet.h include/ipelib.h include/ipeobject.h -include/ipeosx.h include/ipepage.h include/ipepainter.h include/ipepath.h @@ -275,9 +275,11 @@ share/doc/ipe/cpp-ipelets.html share/doc/ipe/dir_7b54d492694b293bf8b54c70d2fe7f56.html share/doc/ipe/dir_91a90e6e897462a7bb8a7a0fc103953b.html share/doc/ipe/dir_d44c64559bbebec7f509842c48db8b23.html +share/doc/ipe/dir_e27e8af4fb4f24f00c2e8a69665fe110.html share/doc/ipe/doc.png share/doc/ipe/doxygen.css -share/doc/ipe/doxygen.png +share/doc/ipe/doxygen.svg +share/doc/ipe/dynsections.js share/doc/ipe/example1.svg share/doc/ipe/example2.svg share/doc/ipe/example3.svg @@ -290,7 +292,6 @@ share/doc/ipe/folderopen.png share/doc/ipe/fontbbox.svg share/doc/ipe/fontbbox2.svg share/doc/ipe/functions.html -share/doc/ipe/functions_0x7e.html share/doc/ipe/functions_b.html share/doc/ipe/functions_c.html share/doc/ipe/functions_d.html @@ -299,7 +300,6 @@ share/doc/ipe/functions_enum.html share/doc/ipe/functions_eval.html share/doc/ipe/functions_f.html share/doc/ipe/functions_func.html -share/doc/ipe/functions_func_0x7e.html share/doc/ipe/functions_func_b.html share/doc/ipe/functions_func_c.html share/doc/ipe/functions_func_d.html @@ -323,6 +323,7 @@ share/doc/ipe/functions_func_v.html share/doc/ipe/functions_func_w.html share/doc/ipe/functions_func_x.html share/doc/ipe/functions_func_z.html +share/doc/ipe/functions_func_~.html share/doc/ipe/functions_g.html share/doc/ipe/functions_h.html share/doc/ipe/functions_i.html @@ -360,6 +361,7 @@ share/doc/ipe/functions_w.html share/doc/ipe/functions_x.html share/doc/ipe/functions_y.html share/doc/ipe/functions_z.html +share/doc/ipe/functions_~.html share/doc/ipe/group__attr.html share/doc/ipe/group__base.html share/doc/ipe/group__cairo.html @@ -419,20 +421,20 @@ share/doc/ipe/manual_40.html share/doc/ipe/manual_42.html share/doc/ipe/manual_43.html share/doc/ipe/manual_44.html -share/doc/ipe/manual_46.html +share/doc/ipe/manual_45.html share/doc/ipe/manual_47.html share/doc/ipe/manual_48.html share/doc/ipe/manual_49.html share/doc/ipe/manual_5.html share/doc/ipe/manual_50.html -share/doc/ipe/manual_52.html -share/doc/ipe/manual_54.html +share/doc/ipe/manual_51.html +share/doc/ipe/manual_53.html share/doc/ipe/manual_55.html -share/doc/ipe/manual_57.html +share/doc/ipe/manual_56.html share/doc/ipe/manual_58.html share/doc/ipe/manual_59.html share/doc/ipe/manual_6.html -share/doc/ipe/manual_61.html +share/doc/ipe/manual_60.html share/doc/ipe/manual_62.html share/doc/ipe/manual_63.html share/doc/ipe/manual_64.html @@ -443,8 +445,9 @@ share/doc/ipe/manual_68.html share/doc/ipe/manual_69.html share/doc/ipe/manual_7.html share/doc/ipe/manual_70.html -share/doc/ipe/manual_72.html +share/doc/ipe/manual_71.html share/doc/ipe/manual_73.html +share/doc/ipe/manual_74.html share/doc/ipe/manual_8.html share/doc/ipe/manual_9.html share/doc/ipe/manual_customize.html