diff options
| -rw-r--r-- | freebsd/Makefile | 64 | ||||
| -rw-r--r-- | freebsd/distinfo | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | freebsd/files/xvfb-run.sh (renamed from freebsd/scripts/xvfb-run.sh) | 0 |
3 files changed, 36 insertions, 34 deletions
diff --git a/freebsd/Makefile b/freebsd/Makefile index 8de1173..abba4c5 100644 --- a/freebsd/Makefile +++ b/freebsd/Makefile @@ -1,5 +1,5 @@ PORTNAME= sciteco -DISTVERSION= 2.1.1 +DISTVERSION= 2.2.0 CATEGORIES= editors textproc devel MASTER_SITES= https://github.com/rhaberkorn/${PORTNAME}/releases/download/v${DISTVERSION}/ \ SOURCEFORGE/${PORTNAME}/v${DISTVERSION}/ @@ -11,23 +11,24 @@ WWW= https://rhaberkorn.github.io/sciteco/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -FLAVORS= curses gtk -FLAVOR?= ${FLAVORS:[1]} -curses_PKGNAMESUFFIX=-curses -gtk_PKGNAMESUFFIX=-gtk +FLAVORS= curses gtk +FLAVOR?= ${FLAVORS:[1]} +curses_PKGNAMESUFFIX= -curses +gtk_PKGNAMESUFFIX= -gtk # As SciTECO uses itself during the build process, # it makes sense to compile it running under a dummy XServer. # This is both faster and works in headless environments as well. -gtk_BUILD_DEPENDS=Xvfb:x11-servers/xorg-server@xvfb \ - xauth:x11/xauth mcookie:devel/util-linux +gtk_BUILD_DEPENDS= mcookie:devel/util-linux \ + xauth:x11/xauth \ + Xvfb:x11-servers/xorg-server@xvfb -USES= gmake pkgconfig compiler:c11 compiler:c++17-lang gnome groff +USES= compiler:c11 gmake gnome groff pkgconfig USE_GNOME= glib20 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= -CONFIGURE_OUTSOURCE=yes +CONFIGURE_OUTSOURCE= yes MAKEFILE= GNUmakefile TEST_TARGET= check @@ -43,38 +44,39 @@ DATADIR= ${PREFIX}/share/gsciteco SUB_FILES= pkg-message .if ${FLAVOR} == curses -USES+= ncurses -CONFIGURE_ARGS+=--with-interface=ncurses -PLIST_SUB+= GTK="@comment " PROGRAM_PREFIX="" +USES+= ncurses +CONFIGURE_ARGS+= --with-interface=ncurses +PLIST_SUB+= GTK="@comment " \ + PROGRAM_PREFIX="" .elif ${FLAVOR} == gtk -USES+= desktop-file-utils +USES+= desktop-file-utils # FIXME: To appease QA checks, we would have to # USE_GNOME+=cairo gdkpixbuf2 and # gtk_LIB_DEPENDS+=libharfbuzz.so:print/harfbuzz -USE_GNOME+= gtk30 -CONFIGURE_ARGS+=--with-interface=gtk --program-prefix=g \ - --with-scitecodatadir="${DATADIR}" -PLIST_SUB+= GTK="" PROGRAM_PREFIX=g +USE_GNOME+= gtk30 +CONFIGURE_ARGS+= --program-prefix=g \ + --with-interface=gtk \ + --with-scitecodatadir="${DATADIR}" +PLIST_SUB+= GTK="" \ + PROGRAM_PREFIX=g .endif -OPTIONS_DEFINE= LEXILLA MALLOC_REPLACEMENT TECO_INTEGER_32 -OPTIONS_DEFAULT=LEXILLA -OPTIONS_SUB= yes +OPTIONS_DEFINE= LEXILLA MALLOC_REPLACEMENT TECO_INTEGER_32 +OPTIONS_DEFAULT= LEXILLA +OPTIONS_SUB= yes -LEXILLA_DESC=Build with Lexilla lexer support (larger) -MALLOC_REPLACEMENT_DESC=Force replacement of system malloc() -TECO_INTEGER_32_DESC=Use 32-bit TECO integers +LEXILLA_DESC= Build with Lexilla lexer support (larger) +MALLOC_REPLACEMENT_DESC= Force replacement of system malloc() +TECO_INTEGER_32_DESC= Use 32-bit TECO integers -LEXILLA_CONFIGURE_OFF=--without-lexilla -MALLOC_REPLACEMENT_CONFIGURE_ON=--enable-malloc-replacement -TECO_INTEGER_32_CONFIGURE_ON=--with-teco-integer=32 +LEXILLA_CONFIGURE_OFF= --without-lexilla +MALLOC_REPLACEMENT_CONFIGURE_ON= --enable-malloc-replacement +TECO_INTEGER_32_CONFIGURE_ON= --with-teco-integer=32 .include <bsd.port.pre.mk> .if ${FLAVOR} == gtk -# Run under Xvfb (see above). -# This is done only now, since USES=gmake would overwrite MAKE_CMD. -MAKE_CMD="${SCRIPTDIR}/xvfb-run.sh" ${GMAKE} +MAKE_CMD= ${SH} ${FILESDIR}/xvfb-run.sh ${GMAKE} .endif post-install: @@ -83,7 +85,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/ico/sciteco-${SZ}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/sciteco.png .endfor - # To appease `make check-plist`: +# To appease `make check-plist`: ${RM} ${STAGEDIR}${DATADIR}/*.png ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/src/sciteco.desktop \ diff --git a/freebsd/distinfo b/freebsd/distinfo index 76b2d07..f0688b4 100644 --- a/freebsd/distinfo +++ b/freebsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731881990 -SHA256 (sciteco-2.1.1.tar.gz) = 5f7f55b2d46f11f73cd122e821daccdfdba9f804473df6213e5f0982bf245c2e -SIZE (sciteco-2.1.1.tar.gz) = 3983183 +TIMESTAMP = 1733772734 +SHA256 (sciteco-2.2.0.tar.gz) = 57ad450623761b76ee8742686db9dd9aae9c1436944e982c36dd368dbbf82020 +SIZE (sciteco-2.2.0.tar.gz) = 3989774 diff --git a/freebsd/scripts/xvfb-run.sh b/freebsd/files/xvfb-run.sh index b4fd5a0..b4fd5a0 100755..100644 --- a/freebsd/scripts/xvfb-run.sh +++ b/freebsd/files/xvfb-run.sh |