Index: head/finance/moneymanagerex/Makefile =================================================================== --- head/finance/moneymanagerex/Makefile (revision 413577) +++ head/finance/moneymanagerex/Makefile (revision 413578) @@ -1,84 +1,83 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= mmex -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.7 DISTVERSIONPREFIX= v CATEGORIES= finance -MASTER_SITES= https://github.com/vslavik/bakefile/releases/download/v0.2.9/:bakefile \ - SF/wxcode/Components/wxSQLite3:wxsqlite3 -DISTFILES= bakefile-0.2.9${EXTRACT_SUFX}:bakefile \ - ${WXSQLITE3_DISTNAME}${EXTRACT_SUFX}:wxsqlite3 +MASTER_SITES= https://github.com/vslavik/bakefile/releases/download/v0.2.9/:bakefile +DISTFILES= bakefile-0.2.9${EXTRACT_SUFX}:bakefile MAINTAINER= ports@FreeBSD.org COMMENT= Free, open-source, easy-to-use personal finance software LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= moneymanagerex GH_PROJECT= moneymanagerex - -WXSQLITE3_DISTNAME= wxsqlite3-3.2.1 - GH_TUPLE= Regaddi:Chart.js:f13f99b:chart_js \ FVANCOP:ChartNew.js:77e7f87:chartnew_js \ diepes:sorttable.js:3c63cb0:sorttable_js \ + utelle:wxsqlite3:v3.3.1:wxsqlite3 \ moneymanagerex:database:5d7129f:database \ moneymanagerex:LuaGlue:c51d11a:luaglue \ moneymanagerex:cajun:3684900:cajun \ moneymanagerex:html-template:cd434ee:html_template \ moneymanagerex:csv-parser:ca3f0d7:csv_parser \ moneymanagerex:ctpp:20158e0:ctpp \ moneymanagerex:mongoose:97583a6:mongoose -USES= autoreconf compiler:c++11-lib gettext gmake +USES= autoreconf compiler:c++11-lib gettext gmake lua pkgconfig GNU_CONFIGURE= yes USE_WX= 3.0 WX_CONF_ARGS= absolute INSTALLS_ICONS= yes +USE_CXXSTD= c++11 CPPFLAGS+= -I${LOCALBASE}/include \ -DHAVE_ACOSH \ -DHAVE_ASINH \ -DHAVE_ATANH \ -DHAVE_ISBLANK \ - -DSQLITE_USER_AUTHENTICATION=0 -LDFLAGS+= -L${LOCALBASE}/lib + $$(pkg-config --cflags lua-${LUA_VER}) +LDFLAGS+= -L${LOCALBASE}/lib $$(pkg-config --libs lua-${LUA_VER}) PORTDOCS= * OPTIONS_DEFINE= DOCS .include .if ${CHOSEN_COMPILER_TYPE} == "gcc" -LIB_DEPENDS+= libboost_system.so:devel/boost-libs -LDFLAGS+= -lboost_system +CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-extract: @${MV} ${WRKSRC_database}/* ${WRKSRC}/database @${MV} ${WRKSRC_chart_js}/* ${WRKSRC}/3rd/Chart.js @${MV} ${WRKSRC_chartnew_js}/* ${WRKSRC}/3rd/ChartNew.js @${MV} ${WRKSRC_luaglue}/* ${WRKSRC}/3rd/LuaGlue @${MV} ${WRKSRC_cajun}/* ${WRKSRC}/3rd/cajun @${MV} ${WRKSRC_csv_parser}/* ${WRKSRC}/3rd/csv-parser @${MV} ${WRKSRC_ctpp}/* ${WRKSRC}/3rd/ctpp @${MV} ${WRKSRC_html_template}/* ${WRKSRC}/3rd/cgitemplate @${MV} ${WRKSRC_mongoose}/* ${WRKSRC}/3rd/mongoose @${MV} ${WRKSRC_sorttable_js}/* ${WRKSRC}/3rd/sorttable.js - @${MV} ${WRKDIR}/${WXSQLITE3_DISTNAME}/* ${WRKSRC}/lib/wxsqlite3 + @${MV} ${WRKSRC_wxsqlite3}/* ${WRKSRC}/lib/wxsqlite3 @${MV} ${WRKDIR}/bakefile-0.2.9/autoconf/*.m4 ${WRKSRC}/m4 post-patch: @${REINPLACE_CMD} -e \ 's|\*.txt|contrib.txt version.txt| ; \ + s|-I$$(srcdir)/lib/lua/src || ; \ + s|$$(LIBPREFIX)lua$$(LIBEXT) || ; \ + s|-llua || ; \ s|$$(datadir)/man|$$(prefix)/man| ; \ s|-ldl$$||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/^AC_INIT/s|1.2.3|${PORTVERSION}| ; \ s|\[noext\]|[]|' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e \ 's| -g0 -O2||' ${WRKSRC}/m4/wxpresets.m4 .include Index: head/finance/moneymanagerex/distinfo =================================================================== --- head/finance/moneymanagerex/distinfo (revision 413577) +++ head/finance/moneymanagerex/distinfo (revision 413578) @@ -1,26 +1,26 @@ SHA256 (bakefile-0.2.9.tar.gz) = 9f3c65411ad3932027e3c3e765337d89be2f9cf5ee9a204da80e92a8c2d76ca5 SIZE (bakefile-0.2.9.tar.gz) = 775528 -SHA256 (wxsqlite3-3.2.1.tar.gz) = 312f2cf63c76a70bae92b78ea6fb7e9485fb23c3ee728daa418babab881939e4 -SIZE (wxsqlite3-3.2.1.tar.gz) = 2810940 -SHA256 (moneymanagerex-moneymanagerex-v1.2.6_GH0.tar.gz) = aa107ec8165fefa757d6a00378b5fc2c4e6b9c8c6087834a4fea92d0c2447bdc -SIZE (moneymanagerex-moneymanagerex-v1.2.6_GH0.tar.gz) = 5394607 +SHA256 (moneymanagerex-moneymanagerex-v1.2.7_GH0.tar.gz) = 44d52e684fe8acba8f5a4723bd44b1ab9b32ca6670190db1759a58a681e4381e +SIZE (moneymanagerex-moneymanagerex-v1.2.7_GH0.tar.gz) = 5400042 SHA256 (Regaddi-Chart.js-f13f99b_GH0.tar.gz) = d951bd59c04942547998200974d2db148fe2ffd72ab29a4bf3ac4bb19252e68d SIZE (Regaddi-Chart.js-f13f99b_GH0.tar.gz) = 71113 SHA256 (FVANCOP-ChartNew.js-77e7f87_GH0.tar.gz) = 6ec3470ac81dadceed8b97ff905d44c8659c6144d27987f9281000aa47dcca3d SIZE (FVANCOP-ChartNew.js-77e7f87_GH0.tar.gz) = 193800 SHA256 (diepes-sorttable.js-3c63cb0_GH0.tar.gz) = 9cc27341400d917dfa24e10f4de86550d35794c69388c311e9fcfd2ba83be403 SIZE (diepes-sorttable.js-3c63cb0_GH0.tar.gz) = 6177 +SHA256 (utelle-wxsqlite3-v3.3.1_GH0.tar.gz) = 4bdb387a69b35f9b06f1c4ad53e511c9c47f2c828de38a6d4edf59fe1d95aac0 +SIZE (utelle-wxsqlite3-v3.3.1_GH0.tar.gz) = 5543873 SHA256 (moneymanagerex-database-5d7129f_GH0.tar.gz) = faf5eb922e616fddbcc7affee333bedf4a7aaef3319db296c0a0da51a67f6011 SIZE (moneymanagerex-database-5d7129f_GH0.tar.gz) = 13424 SHA256 (moneymanagerex-LuaGlue-c51d11a_GH0.tar.gz) = b392fe598b8ec1d93865d6c86341d141a04c817842d29bc65589fbd6c4274b4c SIZE (moneymanagerex-LuaGlue-c51d11a_GH0.tar.gz) = 19959 SHA256 (moneymanagerex-cajun-3684900_GH0.tar.gz) = c48f107e86feb1bd2367e4d33d9e5f1807279503055cc804de0a02fcf21c3f5c SIZE (moneymanagerex-cajun-3684900_GH0.tar.gz) = 15316 SHA256 (moneymanagerex-html-template-cd434ee_GH0.tar.gz) = 104d3c4ff07fb2c9952488dc269047e41e2312c1f15db3cbf5b1200952157fd2 SIZE (moneymanagerex-html-template-cd434ee_GH0.tar.gz) = 38036 SHA256 (moneymanagerex-csv-parser-ca3f0d7_GH0.tar.gz) = d4a7176cfcb62addebeb3e126e64dad8a646e07fbc3481f3128cd08e41b0d036 SIZE (moneymanagerex-csv-parser-ca3f0d7_GH0.tar.gz) = 446850 SHA256 (moneymanagerex-ctpp-20158e0_GH0.tar.gz) = 38548b87348a0ffe16ac7bec4a6a0b0a66552bc92a3ea0c114471c67f0e00192 SIZE (moneymanagerex-ctpp-20158e0_GH0.tar.gz) = 234651 SHA256 (moneymanagerex-mongoose-97583a6_GH0.tar.gz) = 73c2fac2c5efc7d071a6634cafeaab3380d4ba9de482678713ed2ea6a0ec7967 SIZE (moneymanagerex-mongoose-97583a6_GH0.tar.gz) = 111952 Index: head/finance/moneymanagerex/files/patch-lib_wxsqlite3_sqlite3_secure_src_extensionfunctions.c =================================================================== --- head/finance/moneymanagerex/files/patch-lib_wxsqlite3_sqlite3_secure_src_extensionfunctions.c (revision 413577) +++ head/finance/moneymanagerex/files/patch-lib_wxsqlite3_sqlite3_secure_src_extensionfunctions.c (nonexistent) @@ -1,14 +0,0 @@ ---- lib/wxsqlite3/sqlite3/secure/src/extensionfunctions.c.orig 2015-03-03 21:30:22 UTC -+++ lib/wxsqlite3/sqlite3/secure/src/extensionfunctions.c -@@ -208,9 +208,9 @@ int double_cmp(const void *a, const void - - #endif /* _MAP_H_ */ - --typedef uint8_t u8; -+//typedef uint8_t u8; - //typedef uint16_t u16; --typedef int64_t i64; -+//typedef int64_t i64; - - static char *sqlite3StrDup( const char *z ) { - char *res = sqlite3_malloc( strlen(z)+1 ); Property changes on: head/finance/moneymanagerex/files/patch-lib_wxsqlite3_sqlite3_secure_src_extensionfunctions.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property