pkgsrc patches for Darwin 17.3.0

To: tech-pkg <tech-pkg%netbsd.org@localhost>
Subject: pkgsrc patches for Darwin 17.3.0
From: Brook Milligan <brook%nmsu.edu@localhost>
Date: Thu, 29 Mar 2018 08:17:37 -0600
As part of validating the upcoming pkgsrc release, I am trying to build current pkgsrc on a Darwin 17.3.0 system.  I have run into several issues that are outlined here, and have provided tentative patches.

I am happy to commit these, but would like advice on them (including whether or not to commit them) before I do so.

Thanks.

Cheers,
Brook


==================
security/policykit
x11/xdg-user-dirs
==================

Both of these packages have the same problem; the -nonet option to xsltproc prevents downloading certain files.  For example, the following error occurs (along with analogous ones for other files):

/Users/brook/pkg-current/bin/xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl polkit-auth.xml
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl

My patches are the following, which simply remove the -nonet option:

$NetBSD$

--- doc/man/Makefile.am.orig	2008-05-30 21:24:44.000000000 +0000
+++ doc/man/Makefile.am
@@ -9,7 +9,7 @@ man_MANS = polkit-auth.1 	         \
 	   PolicyKit.8
 
 %.1 %.5 %.8 : %.xml
-	$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(XSLTPROC) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 endif # MAN_PAGES_ENABLED
 
$NetBSD$

--- doc/man/Makefile.in.orig	2008-07-22 16:15:07.000000000 +0000
+++ doc/man/Makefile.in
@@ -554,7 +554,7 @@ uninstall-man: uninstall-man1 uninstall-
 
 
 @MAN_PAGES_ENABLED_TRUE@%.1 %.5 %.8 : %.xml
-@MAN_PAGES_ENABLED_TRUE@	$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+@MAN_PAGES_ENABLED_TRUE@	$(XSLTPROC) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 clean-local:
 	rm -f *~ *.1 *.5 *.8

$NetBSD$

--- man/Makefile.am.orig	2013-06-27 08:48:56.000000000 +0000
+++ man/Makefile.am
@@ -1,5 +1,4 @@
 XSLTPROC_FLAGS = \
-        --nonet \
         --stringparam man.output.quietly 1 \
         --stringparam funcsynopsis.style ansi \
         --stringparam man.th.extra1.suppress 1 \

$NetBSD$

--- man/Makefile.in.orig	2017-08-21 07:00:51.000000000 +0000
+++ man/Makefile.in
@@ -269,7 +269,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 XSLTPROC_FLAGS = \
-        --nonet \
         --stringparam man.output.quietly 1 \
         --stringparam funcsynopsis.style ansi \
         --stringparam man.th.extra1.suppress 1 \


==========================
packages requiring libintl
==========================

At least on this system, several packages require libintl but lack a dependency on level/gettext-lib.

My patches are below.

Index: graphics/cairo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/Makefile,v
retrieving revision 1.141
diff -u -r1.141 Makefile
--- graphics/cairo/Makefile	12 Mar 2018 11:15:33 -0000	1.141
+++ graphics/cairo/Makefile	29 Mar 2018 13:29:37 -0000
@@ -8,6 +8,7 @@
 .include "options.mk"
 
 .include "../../archivers/lzo/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.2.95
 .include "../../fonts/fontconfig/buildlink3.mk"
Index: graphics/cairomm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairomm/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- graphics/cairomm/Makefile	12 Mar 2018 11:15:33 -0000	1.40
+++ graphics/cairomm/Makefile	29 Mar 2018 13:29:37 -0000
@@ -39,6 +39,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_ABI_DEPENDS.libsigcpp+=	libsigc++>=2.5.1
 .include "../../devel/libsigc++/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8
Index: graphics/gd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gd/Makefile,v
retrieving revision 1.118
diff -u -r1.118 Makefile
--- graphics/gd/Makefile	12 Mar 2018 11:15:34 -0000	1.118
+++ graphics/gd/Makefile	29 Mar 2018 13:29:37 -0000
@@ -32,6 +32,7 @@
 PTHREAD_AUTO_VARS=	yes
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
Index: print/web2c/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/web2c/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- print/web2c/Makefile	12 Mar 2018 11:17:28 -0000	1.68
+++ print/web2c/Makefile	29 Mar 2018 13:30:00 -0000
@@ -56,6 +56,7 @@
 CONFIGURE_DIRS=		${WRKDIR}/${DISTNAME}/texk/web2c
 INSTALL_DIRS=	${WRKDIR}/${DISTNAME}/texk/web2c
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
Index: x11/libXft/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libXft/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- x11/libXft/Makefile	12 Mar 2018 11:15:53 -0000	1.19
+++ x11/libXft/Makefile	29 Mar 2018 13:30:16 -0000
@@ -17,6 +17,7 @@
 USE_TOOLS+=		pkg-config
 PKGCONFIG_OVERRIDE=	xft.pc.in
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.6
 .include "../../fonts/fontconfig/buildlink3.mk"


==========================================
packages incorrectly using a native libXft
==========================================

As described in http://mail-index.netbsd.org/tech-pkg/2018/03/28/msg019575.html, some packages incorrectly select a native libXft with pig-config and consequently fail.  One solution seems to be to add the following to etc/mk.conf:

PREFER_PKGSRC+=  Xft2 freetype2 fontconfig

However, I note that mk/defaults/mk.conf has the following snippet:

# The default PREFER_PKGSRC should be empty, but due to historical reasons we have the list below.
# Please add your platform here once you have confirmed it is correct
.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig"
PREFER_PKGSRC?=
.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
     exists(/usr/X11R7/lib/libX11.so))
PREFER_PKGSRC?=
.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
     exists(/usr/lib/libexpat.so))
PREFER_PKGSRC?=		MesaLib Xft2 Xrandr Xrender fontconfig	\
			freetype2 glu xcursor
.elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \
      (!defined(X11_TYPE) || ${X11_TYPE} == "native")
PREFER_PKGSRC?=
.elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \
      (!defined(X11_TYPE) || ${X11_TYPE} == "native")
PREFER_PKGSRC?=
.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
      (!defined(X11_TYPE) || ${X11_TYPE} == "native")
PREFER_PKGSRC?=		fontconfig pixman Xft2
.elif !empty(MACHINE_PLATFORM:MCygwin-*-*) && \
     exists(/usr/lib/X11/config/xorgversion.def)
PREFER_PKGSRC?=
.else
PREFER_PKGSRC?=		MesaLib Xft2 Xrandr Xrender expat fontconfig	\
			freetype2 glu xcursor
.endif

The Darwin-??.*-* branch of course matches 17.3.0, so the default PREFER_PKGSRC is empty.  I suggest that at least these three packages be listed there (or in a Darwin-17.*-* branch).  That seems in keeping with similar needs for other platforms, including NetBSD.
Follow-Ups:
- Re: pkgsrc patches for Darwin 17.3.0
  - From: Jonathan Perkin
- Re: pkgsrc patches for Darwin 17.3.0
  - From: J. Lewis Muir
Prev by Date: [FeedBack Required] Porting neovim to NetBSD
Next by Date: Re: pkgsrc patches for Darwin 17.3.0
Previous by Thread: [FeedBack Required] Porting neovim to NetBSD
Next by Thread: Re: pkgsrc patches for Darwin 17.3.0
Indexes:
Home | Main Index | Thread Index | Old Index