On 2023/04/06 22:39:03 +0100, Edd Barrett <e...@theunixzoo.co.uk> wrote: > - portcheck gave me a warning I didn't fully understand: > > "the following libraries in WANTLIB look like masked by RUN_DEPENDS: > rsvg-2 xml2" > > Besides the warning needing a rewording, I've added textproc/libxml and > x11/gnome/librsvg as RUN_DEPENDS to silence it, but I don't understand why > it's needed. If they are valid in WANTLIB (`make port-lib-depends-check` is > fine with it) then something must have already pulled them in...
No idea, but for me it's happy without libxml and librsvg explicity listed in LIB_DEPENDS (they should be already pulled in by x11/gtk+3.) Explicitly listing librsvg doesn't seem a bad idea anyway, since upstream explicitly looks for it. Your choice :) > - Audio recording and playback is super unintuitive. You start recording, > then > draw something, then stop recording, then using the playback tool, click > the > object you drew. I don't see this being useful in its current form, but > since you can't disable it at configure time, there it is! > > - LaTeX functionality requires texlive. I didn't make xournalpp depend on it, > so you would need to install it if you need that feature. Seems obvious, > but > could add a README saying that if anyone thinks it's really necessary. > > - Tested build with dpb (shook out a missing BUILD_DEPEND). > > I haven't used it much yet, but I will do next week. > > Any comments / OKs? Some nits: - the Makefile is needlessly executable - doesn't need DISTNAME, default one from GH_* is fine - so V can go away too - I'd annotate the C++ version - and disable git at configure time and set "DISTRO_CODENAME" to avoid some warnings. the "distro" doesn't seem to be actually used in the program. - SEPARATE_BUILD=Yes is the default per cmake.port.mk I'm attacching a diff against your Makefile that address these points (except for the chmod -x Makefile), it's ok for me then. I've only quickly tested it since without a touch screen it's not terribly useful. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/audio/portaudio-svn/Makefile,v > retrieving revision 1.22 > diff -u -p -r1.22 Makefile > --- Makefile 11 Mar 2022 18:20:26 -0000 1.22 > +++ Makefile 30 Mar 2023 19:39:16 -0000 > [...] > -WANTLIB= m pthread sndio > +WANTLIB= ${COMPILER_LIBCXX} m pthread sndio Since we're gaining a WANTLIB on the C++ stdlib it needs a COMPILER line too, something like +COMPILER= base-clang ports-gcc maybe base-gcc could be allowed too, I've never really understood the rules for C++ stdlib mixing ^^" With this point addressed (and maybe confirmed by someone else) the portaudio change is ok for me too. Thanks! Omar Polo --- Makefile.orig Wed Apr 12 17:32:07 2023 +++ Makefile Wed Apr 12 17:54:22 2023 @@ -1,11 +1,8 @@ COMMENT = handwriting notetaking with PDF annotation support -V = 1.1.3 -DISTNAME = xournalpp-${V} - GH_ACCOUNT = xournalpp GH_PROJECT = xournalpp -GH_TAGNAME = v${V} +GH_TAGNAME = v1.1.3 CATEGORIES = print graphics productivity @@ -22,11 +19,15 @@ WANTLIB += pangocairo-1.0 poppler-glib portaudio portaudiocpp WANTLIB += rsvg-2 sndfile xml2 z zip +# C++17 COMPILER = base-clang ports-gcc MODULES = devel/cmake \ lang/lua +CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \ + -DDISTRO_CODENAME=OpenBSD + # Lua version hard-coded in CMakelists. MODLUA_VERSION = 5.3 @@ -37,11 +38,7 @@ audio/libsndfile \ audio/portaudio-svn>=1970p0 \ print/poppler \ - textproc/libxml \ - x11/gnome/librsvg \ x11/gtk+3 - -SEPARATE_BUILD = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/src/control/settings/LatexSettings.h