Re: ghostscript tweaks

Hi,


On 1/29/22 18:12, Antoine Jacoutot wrote:

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
> retrieving revision 1.120
> diff -u -p -r1.120 Makefile
> --- Makefile 29 Jan 2022 07:37:14 -0000 1.120
> +++ Makefile 29 Jan 2022 17:02:24 -0000
> @@ -6,7 +6,7 @@ VERSION = 9.55.0
> DISTNAME = ghostscript-${VERSION}
> CATEGORIES = lang print
> SHARED_LIBS = gs 16.0
> -REVISION = 0
> +REVISION = 1
>
> MASTER_SITES = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${VERSION:S/.//g}/
>
> @@ -42,8 +42,6 @@ LIB_DEPENDS += print/cups,-libs
> LIB_DEPENDS += print/ijs
> LIB_DEPENDS += print/libpaper
>
> -CFLAGS = -DSYS_TYPES_HAS_STDINT_TYPES
> -
> MAKE_FLAGS = LIB_VERSION_MAJOR=${LIBgs_VERSION:R} \
> LIB_VERSION_MINOR=${LIBgs_VERSION:E}
>
> @@ -78,7 +76,6 @@ WANTLIB += glib-2.0 gobject-2.0 gtk-3 ha
> WANTLIB += pangocairo-1.0
> CONFIGURE_ARGS += --enable-gtk
> .elif ${FLAVOR:Mno_x11}
> -CFLAGS += "-I/usr/X11R6/include/"

I put that in because I couldn't build no_x11 without. Did it work for you?

> CONFIGURE_ARGS += --disable-dbus
> CONFIGURE_ARGS += --disable-gtk
> CONFIGURE_ARGS += --without-x
> @@ -96,6 +93,9 @@ CFLAGS += -DA4
> CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib"
>
> NO_TEST = Yes
> +
> +DEBUG_PACKAGES = ${BUILD_PACKAGES}
> +
> # Just delete all the bundled directories that are not needed
> pre-configure:
> rm -rf ${WRKSRC}/freetype && \
> @@ -109,18 +109,8 @@ pre-configure:
> rm -rf ${WRKSRC}/zlib
>
> post-install:
> - if [ -x ${PREFIX}/bin/gsc ]; then \
> - mv ${PREFIX}/bin/gsc ${PREFIX}/bin/gs; \
> - fi
> - if [ -x ${PREFIX}/bin/gsx ]; then \
> - mv ${PREFIX}/bin/gsx ${PREFIX}/bin/gs; \
> - fi
> - if [ -x ${PREFIX}/lib/libgs.so ]; then \
> - rm ${PREFIX}/lib/libgs.so; \
> - fi
> - if [ -x ${PREFIX}/lib/libgs.so.${LIBgs_VERSION:R} ]; then \
> - rm ${PREFIX}/lib/libgs.so.${LIBgs_VERSION:R}; \
> - fi
> - ${STRIP} ${PREFIX}/bin/gs
> + rm -f ${PREFIX}/lib/libgs.so{,.${LIBgs_VERSION:R}}
> +# rename the dynamic binary
> + mv ${PREFIX}/bin/{gsc,gs}
>
> .include <bsd.port.mk>
> Index: pkg/PFRAG.gtk
> ===================================================================
> RCS file: pkg/PFRAG.gtk
> diff -N pkg/PFRAG.gtk
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PFRAG.gtk 29 Jan 2022 17:02:24 -0000
> @@ -0,0 +1,2 @@
> +@comment $OpenBSD$
> +@bin bin/gsx
> Index: pkg/PLIST

I see gsx built and installed for all three flavors. For non-gtk flavors
it's identical to gsc, but it's there ... would't this break for non-gtk
flavours due to the missing gsx in the PLIST?

cu,
Volker