On Sat, Jan 29, 2022 at 11:13:16AM +0100, Volker Schlecht wrote:
> Hi,
>
> On 1/29/22 09:35, Antoine Jacoutot wrote:
>
> > -CFLAGS = -DSYS_TYPES_HAS_STDINT_TYPES
> > +CFLAGS += -DSYS_TYPES_HAS_STDINT_TYPES
>
> I actually dont't think we even need to set that flag explicitly anymore,
> ghostscript built and worked fine without. But I didn't know if the reason
> why it was included in the first place was gone, so I kept it.
>
> > - remove most of the weird post-install dance, install gsx and gsc and
> don't enforce strip(1)
>
> dito, regarding strip(1)
>
> > +@bin bin/gsc
> > +@bin bin/gsx
>
> Given the conflict with lang/gambit, is there a cleaner / nicer / more
> maintainable solution?
New diff without gsc.
We can decide over a solution for this later. Either make the packages
explicitely conflict or rename the binary.
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 10:19:40 -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}
@@ -96,6 +94,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 +110,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}}
+# conflict with lang/gambit
+ rm -f ${PREFIX}/bin/gsc
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PLIST,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST
--- pkg/PLIST 27 Jan 2022 20:55:01 -0000 1.30
+++ pkg/PLIST 29 Jan 2022 10:19:41 -0000
@@ -8,6 +8,7 @@ bin/gsdj500
bin/gslj
bin/gslp
bin/gsnd
+@bin bin/gsx
bin/lprsetup.sh
bin/pdf2dsc
bin/pdf2ps
