On 2022/03/17 06:26, Josh Grosse wrote: > On Thu, Mar 17, 2022 at 12:38:07AM +0000, Stuart Henderson wrote: > > On 2022/03/16 19:39, Josh Grosse wrote: > > > Yes, thanks! I'll rebuild here and send an updated diff > > > after I've tested. It takes a few hours on this laptop. :) > > New diff attached. Your recommended changes, plus: > > * revised distinfo - the tarball is now an svn repository instead > of an export from it. > * subversion added to BUILD_DEPENDS.
Sorry, not a fan of this at all, it doubles the size of the distfile, adds a fairly heavy set of BUILD_DEPENDS (subversion, apr/apr-util, cyrus-sasl and more) and all to provide an svn revision that the port already knows about. > --- a/devel/codeblocks/patches/patch-configure > --- a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in Just noticed these two are touching files which are regenerated by bootstrap. It would be better to touch the input files and switch to the normal order of patch-then-bootstrap (less chance of breakage during updates, and avoids confusing porters who expect it to work like other ports ;) How about this on top? (Plus maybe go back to the smaller distfile?) It doesn't inlude the svn date but the rev should be good enough. diff -uNp -x CVS -r codeblocks.jggimi/Makefile codeblocks/Makefile --- codeblocks.jggimi/Makefile Sun Mar 20 09:46:21 2022 +++ codeblocks/Makefile Sun Mar 20 09:44:57 2022 @@ -1,20 +1,18 @@ BROKEN-alpha= sqvm.cpp:394:1: internal compiler error: Segmentation fault COMMENT= Code::Blocks C/C++ IDE -V= 20.03pl12751 +R= 12751 +V= 20.03 -# source tarball for this OpenBSD-specific patch level: -MASTER_SITES1= https://jggimi.net/codeblocks/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1 - -DISTNAME= codeblocks-${V} -PKGNAME= codeblocks-${V} +DISTNAME= codeblocks-${V}pl${R} EXTRACT_SUFX= .tar.xz +# source tarball for this OpenBSD-specific patch level: +MASTER_SITES= https://jggimi.net/codeblocks/ +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/} + DEBUG_PACKAGES=${BUILD_PACKAGES} -WRKDIST= ${WRKDIR}/codeblocks-${V} - SHARED_LIBS += codeblocks 0.1 # 0.1 SHARED_LIBS += wxchartctrl 0.1 # 0.1 SHARED_LIBS += wxflatnotebook 0.1 # 0.1 @@ -50,11 +48,8 @@ WANTLIB += wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0 wx_gtk3u WANTLIB += wx_gtk3u_propgrid-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_richtext-3.0 WANTLIB += wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm z zstd -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/} +BUILD_DEPENDS= archivers/zip -BUILD_DEPENDS= archivers/zip \ - devel/subversion,-main - LIB_DEPENDS= archivers/bzip2 \ devel/boost \ sysutils/gamin \ @@ -74,7 +69,9 @@ BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} \ devel/libtool -CONFIGURE_STYLE=gnu +CONFIGURE_STYLE=autoreconf +AUTORECONF= ./bootstrap + CXXFLAGS += -std=c++11 CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -82,15 +79,11 @@ CONFIGURE_ARGS= --with-contrib-plugins=all CONFIGURE_ARGS += --enable-debug CONFIGURE_ARGS += --with-boost-libdir=${LOCALBASE}/lib -MAKE_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ - AUTOCONF_VERSION=${AUTOCONF_VERSION} - -pre-patch: - cd ${WRKSRC}; \ - env \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ - AUTOCONF_VERSION=${AUTOCONF_VERSION} \ - ${WRKSRC}/bootstrap +post-patch: + echo : > ${WRKSRC}/update_revision.sh + echo 'm4_define([SVN_REV], ${R})' > ${WRKSRC}/revision.m4 + echo 'm4_define([SVN_REVISION], ${V}svn${R})' >> ${WRKSRC}/revision.m4 + echo 'm4_define([SVN_DATE], )' >> ${WRKSRC}/revision.m4 pre-configure: ${SUBST_CMD} ${WRKSRC}/src/plugins/compilergcc/compilergcc.cpp diff -uNp -x CVS -r codeblocks.jggimi/patches/patch-bootstrap codeblocks/patches/patch-bootstrap --- codeblocks.jggimi/patches/patch-bootstrap Thu Jan 1 01:00:00 1970 +++ codeblocks/patches/patch-bootstrap Sun Mar 20 09:43:26 2022 @@ -0,0 +1,12 @@ +Index: bootstrap +--- bootstrap.orig ++++ bootstrap +@@ -64,7 +64,7 @@ rm -rf autom4te.cache + + # Make the build more robust if a Makefile.am is removed from the file system, but it is not removed + # from the configure.ac file. +-find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs rm -v ++find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs -r rm -v + + rm -vf debian/control + echo "Note: If you want to build debian packages you have to first run the debian/setup_control.sh script. See the script for details how to use it." diff -uNp -x CVS -r codeblocks.jggimi/patches/patch-configure codeblocks/patches/patch-configure --- codeblocks.jggimi/patches/patch-configure Sun Mar 20 09:46:21 2022 +++ codeblocks/patches/patch-configure Thu Jan 1 01:00:00 1970 @@ -1,21 +0,0 @@ -undefined reference to `free' - -Index: configure ---- configure.orig -+++ configure -@@ -16899,7 +16899,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false; - else - - ax_check_save_flags=$LDFLAGS -- LDFLAGS="$LDFLAGS -Wl,--no-undefined" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -16923,7 +16922,6 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___no_undefined" >&5 - $as_echo "$ax_cv_check_ldflags___Wl___no_undefined" >&6; } - if test "x$ax_cv_check_ldflags___Wl___no_undefined" = xyes; then : -- LDFLAGS="-Wl,--no-undefined $LDFLAGS" - else - : - fi diff -uNp -x CVS -r codeblocks.jggimi/patches/patch-configure_ac codeblocks/patches/patch-configure_ac --- codeblocks.jggimi/patches/patch-configure_ac Thu Jan 1 01:00:00 1970 +++ codeblocks/patches/patch-configure_ac Sun Mar 20 09:41:40 2022 @@ -0,0 +1,14 @@ +undefined reference to `free' + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -42,8 +42,6 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_AWK + +-CODEBLOCKS_CHECK_LINK_FLAG([-Wl,--no-undefined],[LDFLAGS="-Wl,--no-undefined $LDFLAGS"]) +- + CODEBLOCKS_SETUP_FOR_TARGET + + dnl Checks for header files. diff -uNp -x CVS -r codeblocks.jggimi/patches/patch-src_base_tinyxml_Makefile_am codeblocks/patches/patch-src_base_tinyxml_Makefile_am --- codeblocks.jggimi/patches/patch-src_base_tinyxml_Makefile_am Thu Jan 1 01:00:00 1970 +++ codeblocks/patches/patch-src_base_tinyxml_Makefile_am Sun Mar 20 09:42:35 2022 @@ -0,0 +1,15 @@ +Make sure bundled tinyxml is ahead of system tinyxml in search path + +Index: src/base/tinyxml/Makefile.am +--- src/base/tinyxml/Makefile.am.orig ++++ src/base/tinyxml/Makefile.am +@@ -1,7 +1,8 @@ + AM_CPPFLAGS = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + -I$(top_srcdir)/src/include \ +- -I$(top_srcdir)/src/include/tinyxml ++ -I$(top_srcdir)/src/include/tinyxml \ ++ $(WX_CXXFLAGS) + + noinst_LTLIBRARIES = libtinyxml.la + diff -uNp -x CVS -r codeblocks.jggimi/patches/patch-src_base_tinyxml_Makefile_in codeblocks/patches/patch-src_base_tinyxml_Makefile_in --- codeblocks.jggimi/patches/patch-src_base_tinyxml_Makefile_in Sun Mar 20 09:46:21 2022 +++ codeblocks/patches/patch-src_base_tinyxml_Makefile_in Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ -Fix build when tinyxml is installed. -(tinyxml is bundled within codeblocks, so prefer the bundled includes) - -Index: src/base/tinyxml/Makefile.in ---- src/base/tinyxml/Makefile.in.orig -+++ src/base/tinyxml/Makefile.in -@@ -417,10 +417,10 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - zlib_CFLAGS = @zlib_CFLAGS@ - zlib_LIBS = @zlib_LIBS@ --AM_CPPFLAGS = $(WX_CXXFLAGS) \ -- -I$(top_srcdir)/src/sdk/wxscintilla/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(top_srcdir)/src/include \ -- -I$(top_srcdir)/src/include/tinyxml -+ -I$(top_srcdir)/src/include/tinyxml \ -+ $(WX_CXXFLAGS) - - noinst_LTLIBRARIES = libtinyxml.la - libtinyxml_la_SOURCES = tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
