This fixes the known fallout from adding a "vendor lib" to the base
perl. The goal is to make it harder to get the "loadable library and
perl binaries are mismatched" error when base perl is updated.
The fixed patch for adding the vendor lib to perl is over on tech@.
This set of patches should mostly work without the addition of the
vendor directory as we hardcode the path in the Makefile and the vendor
lib patch makes the current path where ports and packages go and adds a
${version} directory under that for CPAN and other manually installed
modules to go into, so our hardcoded path won't change.
The two patches at the end for GraphicsMagick and libproxy tell them to
specifically to use the "vendor lib" instead of the "site lib", so they
will likely stop building if that part of the patch is applied. I am
going back to a snapshot on my test machine now to try this out,
although with a vendor lib the packages all built on both sparc64 and
amd64 (well, not devel/cil as that doesn't work on sparc64).
Most of the fixes are just adding "perl" to the MODULES in the port.
I'm certain I did something terrible to the perl.port.mk, but I think it
does what I want.
I don't know how prevalent some of the things I put in the environment
are, like PERL_EXT_LIB, so maybe they belong in the specific ports
Makefiles that need them and I don't know if there are any ports that
use Module::Build{,::Tiny} past the CONFIGURE stage, so that might not
need to go into the MAKE_ENV either.
I did use ${LOCALBASE} instead of ${PREFIX} as we're pointing at a
specific folder. I'm actually fairly certain that _perl_ doesn't obey
${LOCALBASE} at the moment, but I'm open to fixing that when time
permits.
We should probably have portcheck look for things in the new site lib
once that patch goes in, but not just yet.
Index: infrastructure/mk/perl.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.30
diff -u -p -r1.30 perl.port.mk
--- infrastructure/mk/perl.port.mk 3 Dec 2017 11:10:10 -0000 1.30
+++ infrastructure/mk/perl.port.mk 31 Jul 2021 00:01:45 -0000
@@ -7,6 +7,43 @@
TEST_TARGET ?= test
MODPERL_BUILD ?= Build
+P5SITE = libdata/perl5/site_perl
+P5ARCH = ${P5SITE}/${MACHINE_ARCH}-openbsd
+SUBST_VARS += P5ARCH P5SITE
+
+# For autoconf/automake
+CONFIGURE_ENV += PERL_LIB="${LOCALBASE}/${P5SITE}"
PERL_ARCH="${LOCALBASE}/${P5ARCH}"
+#MAKE_ENV += PERL_LIB="${LOCALBASE}/${P5SITE}"
PERL_ARCH="${LOCALBASE}/${P5ARCH}"
+
+# http://www.gnu.org/software/autoconf-archive/ax_perl_ext.html
+CONFIGURE_ENV += PERL_EXT_LIB="${LOCALBASE}/${P5ARCH}"
+#MAKE_ENV += PERL_EXT_LIB="${LOCALBASE}/${P5ARCH}"
+
+PERL_MM_OPT = INSTALLSITELIB="${LOCALBASE}/${P5SITE}" \
+ INSTALLSITEARCH="${LOCALBASE}/${P5ARCH}" \
+ INSTALLPRIVLIB="/usr/./libdata/perl5" \
+ INSTALLARCHLIB="\$${INSTALLPRIVLIB}/${MACHINE_ARCH}-openbsd" \
+ INSTALLMAN1DIR="${LOCALBASE}/man/man1" \
+ INSTALLMAN3DIR="${LOCALBASE}/man/man3p" \
+ INSTALLBIN="$${LOCALBASE}/bin" \
+ INSTALLSCRIPT="$${INSTALLBIN}"
+
+# For ExtUtils::MakeMaker
+# in MAKE_ENV because some ports that include modules run it late
+CONFIGURE_ENV += PERL_MM_OPT="${PERL_MM_OPT}" PERL_MM_USE_DEFAULT=1
+MAKE_ENV += PERL_MM_OPT="${PERL_MM_OPT}" PERL_MM_USE_DEFAULT=1
+
+PERL_MB_OPT = --install_path=lib=${LOCALBASE}/${P5SITE} \
+ --install_path=arch=${LOCALBASE}/${P5ARCH} \
+ --install_path=libdoc="${LOCALBASE}/man/man3p" \
+ --install_path=bindoc="${LOCALBASE}/man/man1" \
+ --install_path=bin="${LOCALBASE}/bin" \
+ --install_path=script="${LOCALBASE}/bin"
+
+# For Module::Build and Module::Build::Tiny
+CONFIGURE_ENV += PERL_MB_OPT="${PERL_MB_OPT}"
+#MAKE_ENV += PERL_MB_OPT="${PERL_MB_OPT}"
+
# set /usr/bin/perl for executable scripts
MODPERL_BIN_ADJ = perl -pi \
-e '$$. == 1 && s|^.*env
perl([0-9.]*)([\s].*)?$$|\#!/usr/bin/perl$$2|;' \
@@ -20,44 +57,17 @@ MODPERL_pre-configure = for f in ${MODPE
.endif
.if ${CONFIGURE_STYLE:L:Mmodbuild}
-. if ${CONFIGURE_STYLE:L:Mtiny}
-MODPERL_configure = \
- arch=`perl -e 'use Config; print $$Config{archname}, "\n";'`; \
- cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} \
- perl Build.PL \
- --install_path=lib="${PREFIX}/libdata/perl5/site_perl" \
- --install_path=arch="${PREFIX}/libdata/perl5/site_perl/$$arch" \
- --install_path=libdoc="${PREFIX}/man/man3p" \
- --install_path=bindoc="${PREFIX}/man/man1" \
- --install_path=bin="${PREFIX}/bin" \
- --install_path=script="${PREFIX}/bin" ${CONFIGURE_ARGS}
-. else
MODPERL_configure = \
- arch=`perl -e 'use Config; print $$Config{archname}, "\n";'`; \
cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} \
- perl Build.PL \
- install_path=lib="${PREFIX}/libdata/perl5/site_perl" \
- install_path=arch="${PREFIX}/libdata/perl5/site_perl/$$arch" \
- install_path=libdoc="${PREFIX}/man/man3p" \
- install_path=bindoc="${PREFIX}/man/man1" \
- install_path=bin="${PREFIX}/bin" \
- install_path=script="${PREFIX}/bin" ${CONFIGURE_ARGS}
-. endif
+ perl Build.PL ${CONFIGURE_ARGS}; \
+ if ! test -f ${WRKBUILD}/Build; then \
+ echo >&2 "Fatal: Build.PL did not produce a Build script"; \
+ exit 1; \
+ fi
.else
MODPERL_configure = ${_MODPERL_preconfig}; \
- arch=`perl -e 'use Config; print $$Config{archname}, "\n";'`; \
cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} \
- PERL_MM_USE_DEFAULT=Yes \
- perl Makefile.PL \
- PREFIX='${PREFIX}' \
- INSTALLSITELIB='${PREFIX}/libdata/perl5/site_perl' \
- INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
- INSTALLPRIVLIB='/usr/./libdata/perl5' \
- INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
- INSTALLMAN1DIR='${PREFIX}/man/man1' \
- INSTALLMAN3DIR='${PREFIX}/man/man3p' \
- INSTALLBIN='$${PREFIX}/bin' \
- INSTALLSCRIPT='$${INSTALLBIN}' ${CONFIGURE_ARGS}; \
+ perl Makefile.PL PREFIX='${PREFIX}' ${CONFIGURE_ARGS}; \
if ! test -f ${WRKBUILD}/Makefile; then \
echo >&2 "Fatal: Makefile.PL did not produce a Makefile"; \
exit 1; \
@@ -72,8 +82,7 @@ _MODPERL_preconfig = :
. endif
.endif
-MODPERL_pre-fake = \
- mkdir -p ${WRKINST}`perl -e 'use Config; print
$$Config{installarchlib}, "\n";'`
+MODPERL_pre-fake = mkdir -p ${WRKINST}${PERL_ARCH}/auto
.if ${CONFIGURE_STYLE:L:Mmodbuild}
. if ${CONFIGURE_STYLE:L:Mtiny}
@@ -90,6 +99,7 @@ MODPERL_BUILD_TARGET = \
MODPERL_TEST_TARGET = \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} perl \
${MODPERL_BUILD} ${TEST_TARGET}
+
MODPERL_INSTALL_TARGET = \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} perl \
${MODPERL_BUILD} ${FAKE_TARGET} --destdir=${WRKINST}
@@ -107,7 +117,3 @@ do-install:
@${MODPERL_INSTALL_TARGET}
. endif
.endif
-
-P5SITE = libdata/perl5/site_perl
-P5ARCH = ${P5SITE}/${MACHINE_ARCH}-openbsd
-SUBST_VARS += P5ARCH P5SITE
Index: audio/xmms2/Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- audio/xmms2/Makefile 3 Mar 2021 17:07:52 -0000 1.56
+++ audio/xmms2/Makefile 31 Jul 2021 00:01:45 -0000
@@ -67,6 +67,7 @@ do-configure:
--prefix=${PREFIX} \
--mandir=${PREFIX}/man \
--conf-prefix=${PREFIX} \
+ --with-perl-archdir=${LOCALBASE}/${P5ARCH} \
--with-default-output-plugin=ao \
--no-cython \
--disable-shmvis-server \
Index: comms/hamlib/Makefile
===================================================================
RCS file: /cvs/ports/comms/hamlib/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- comms/hamlib/Makefile 23 Feb 2021 19:39:10 -0000 1.42
+++ comms/hamlib/Makefile 31 Jul 2021 00:01:45 -0000
@@ -21,7 +21,8 @@ SHARED_LIBS += hamlib++ 3.0
HOMEPAGE= http://hamlib.sourceforge.net/
-MODULES= lang/python \
+MODULES= perl \
+ lang/python \
lang/tcl
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
Index: comms/pilot-link/Makefile
===================================================================
RCS file: /cvs/ports/comms/pilot-link/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- comms/pilot-link/Makefile 12 Jul 2019 20:43:48 -0000 1.85
+++ comms/pilot-link/Makefile 31 Jul 2021 00:01:45 -0000
@@ -25,6 +25,8 @@ WANTLIB += c curses iconv intl m perl pn
# uses perl ABI
+MODULES = perl
+
LIB_DEPENDS= graphics/png \
devel/popt
Index: databases/xapian-bindings/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- databases/xapian-bindings/Makefile 6 Jul 2021 16:55:32 -0000 1.34
+++ databases/xapian-bindings/Makefile 31 Jul 2021 00:01:45 -0000
@@ -36,7 +36,8 @@ LIB_DEPENDS= databases/xapian-core
BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}>=4.0.2
MODULES= lang/python \
- lang/ruby
+ lang/ruby \
+ perl
MULTI_PACKAGES= -main -python -ruby
@@ -50,7 +51,7 @@ SUBST_VARS+= MODRUBY_BINREV
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
-CONFIGURE_ENV= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}"
+CONFIGURE_ENV+= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}"
CONFIGURE_ARGS= --with-perl \
--with-python3 \
--with-ruby \
Index: devel/cil/Makefile
===================================================================
RCS file: /cvs/ports/devel/cil/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- devel/cil/Makefile 9 Jun 2020 17:34:13 -0000 1.40
+++ devel/cil/Makefile 31 Jul 2021 00:01:45 -0000
@@ -19,7 +19,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= c m pthread
-MODULES = lang/ocaml
+MODULES = lang/ocaml perl
BUILD_DEPENDS= sysutils/findlib \
devel/ocaml-ocamlbuild \
math/ocaml-num
Index: devel/subversion/Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- devel/subversion/Makefile 23 Feb 2021 22:04:35 -0000 1.188
+++ devel/subversion/Makefile 31 Jul 2021 00:01:45 -0000
@@ -55,7 +55,8 @@ FLAVOR?=
FLAVOR += no_perl no_python no_ruby
.endif
-MODULES= lang/python
+MODULES= lang/python \
+ perl
WANTLIB= expat iconv intl lz4 m pthread z
Index: devel/subversion/pkg/PLIST-perl
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-perl,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-perl
--- devel/subversion/pkg/PLIST-perl 15 May 2020 14:47:40 -0000 1.10
+++ devel/subversion/pkg/PLIST-perl 31 Jul 2021 00:01:45 -0000
@@ -3,41 +3,40 @@
@static-lib lib/libsvn_swig_perl-1.a
lib/libsvn_swig_perl-1.la
@lib lib/libsvn_swig_perl-1.so.${LIBsvn_swig_perl-1_VERSION}
-libdata/perl5/${MACHINE_ARCH}-openbsd/
-libdata/perl5/${MACHINE_ARCH}-openbsd/perllocal.pod
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Base.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Client.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Core.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Delta.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Fs.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Ra.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Repos.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Wc.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/
-@comment
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/
-@comment
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/_Core.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Core/_Core.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/
-@comment
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/_Delta.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Delta/_Delta.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/
-@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/_Fs.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Fs/_Fs.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/
-@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/_Ra.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Ra/_Ra.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/
-@comment
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/_Repos.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Repos/_Repos.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/
-@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/_Wc.bs
-@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Wc/_Wc.so
+${P5ARCH}/
+${P5ARCH}/SVN/
+${P5ARCH}/SVN/Base.pm
+${P5ARCH}/SVN/Client.pm
+${P5ARCH}/SVN/Core.pm
+${P5ARCH}/SVN/Delta.pm
+${P5ARCH}/SVN/Fs.pm
+${P5ARCH}/SVN/Ra.pm
+${P5ARCH}/SVN/Repos.pm
+${P5ARCH}/SVN/Wc.pm
+${P5ARCH}/auto/
+${P5ARCH}/auto/SVN/
+${P5ARCH}/auto/SVN/_Client/
+@comment ${P5ARCH}/auto/SVN/_Client/_Client.bs
+@so ${P5ARCH}/auto/SVN/_Client/_Client.so
+${P5ARCH}/auto/SVN/_Core/
+@comment ${P5ARCH}/auto/SVN/_Core/_Core.bs
+${P5ARCH}/auto/SVN/_Core/.packlist
+@so ${P5ARCH}/auto/SVN/_Core/_Core.so
+${P5ARCH}/auto/SVN/_Delta/
+@comment ${P5ARCH}/auto/SVN/_Delta/_Delta.bs
+@so ${P5ARCH}/auto/SVN/_Delta/_Delta.so
+${P5ARCH}/auto/SVN/_Fs/
+@comment ${P5ARCH}/auto/SVN/_Fs/_Fs.bs
+@so ${P5ARCH}/auto/SVN/_Fs/_Fs.so
+${P5ARCH}/auto/SVN/_Ra/
+@comment ${P5ARCH}/auto/SVN/_Ra/_Ra.bs
+@so ${P5ARCH}/auto/SVN/_Ra/_Ra.so
+${P5ARCH}/auto/SVN/_Repos/
+@comment ${P5ARCH}/auto/SVN/_Repos/_Repos.bs
+@so ${P5ARCH}/auto/SVN/_Repos/_Repos.so
+${P5ARCH}/auto/SVN/_Wc/
+@comment ${P5ARCH}/auto/SVN/_Wc/_Wc.bs
+@so ${P5ARCH}/auto/SVN/_Wc/_Wc.so
@man man/man3p/SVN::Base.3p
@man man/man3p/SVN::Client.3p
@man man/man3p/SVN::Core.3p
Index: devel/uuid/Makefile
===================================================================
RCS file: /cvs/ports/devel/uuid/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- devel/uuid/Makefile 12 Jul 2019 20:46:03 -0000 1.58
+++ devel/uuid/Makefile 31 Jul 2021 00:01:45 -0000
@@ -25,6 +25,8 @@ HOMEPAGE= http://www.ossp.org/pkg/lib/uu
MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/uuid/
+MODULES= perl
+
# BSD
PERMIT_PACKAGE= Yes
Index: mail/cyrus-imapd/Makefile
===================================================================
RCS file: /cvs/ports/mail/cyrus-imapd/Makefile,v
retrieving revision 1.133
diff -u -p -r1.133 Makefile
--- mail/cyrus-imapd/Makefile 14 May 2021 17:42:59 -0000 1.133
+++ mail/cyrus-imapd/Makefile 31 Jul 2021 00:01:45 -0000
@@ -27,6 +27,8 @@ WANTLIB += uuid z
MASTER_SITES=
https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-${V}/
+MODULES= perl
+
COMPILER= base-clang ports-gcc base-gcc
USE_GMAKE= Yes
@@ -71,8 +73,7 @@ post-install:
cp -R ${WRKSRC}/tools ${PREFIX}/share/examples/cyrus-imapd/
${INSTALL_DATA} ${FILESDIR}/imapd.conf \
${PREFIX}/share/examples/cyrus-imapd/
- rm -r ${PREFIX}/libdata/perl5/${MACHINE_ARCH}-openbsd \
- ${PREFIX}/share/doc/cyrus-imapd/text
+ rm -r ${PREFIX}/share/doc/cyrus-imapd/text
# cleanup
rm -r ${PREFIX}/share/doc/cyrus-imapd/html/{_*,.buildinfo}
find ${PREFIX}/share/{doc,examples}/cyrus-imapd -name '.gitignore' -or \
Index: net/liboping/Makefile
===================================================================
RCS file: /cvs/ports/net/liboping/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- net/liboping/Makefile 12 Jul 2019 20:48:30 -0000 1.7
+++ net/liboping/Makefile 31 Jul 2021 00:01:45 -0000
@@ -12,6 +12,8 @@ HOMEPAGE = http://noping.cc/
# LGPL v2.1+ (lib) GPLv2+ (binaries)
PERMIT_PACKAGE = Yes
+MODULES = perl
+
WANTLIB += c m curses perl
MASTER_SITES = http://noping.cc/files/
Index: net/munin/Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- net/munin/Makefile 10 Jul 2021 18:29:15 -0000 1.105
+++ net/munin/Makefile 31 Jul 2021 00:01:45 -0000
@@ -27,7 +27,7 @@ MULTI_PACKAGES = -main -server
# Used for file locations and MODPY_BIN, RUBY, MODRUBY_ADJ_FILES.
# Only very minor optional munin plugins use these languages so they
# aren't forced as dependencies (same for bash).
-MODULES = lang/python lang/ruby
+MODULES = lang/python lang/ruby perl
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
# No need for MODx_RUNDEP as we already override RUN_DEPENDS-{main,server}
MODPY_BUILDDEP = No
@@ -64,7 +64,8 @@ MAKE_ENV += CONFDIR=${SYSCONFDIR}/munin
PREFIX=${PREFIX} \
PYTHON=${MODPY_BIN}
MAKE_FLAGS += BASH=${LOCALBASE}/bin/bash \
- PLUGINUSER=_munin-plugin
+ PLUGINUSER=_munin-plugin \
+ PERLLIB=${WRKINST}${LOCALBASE}/${P5SITE}
FAKE_FLAGS += HTMLDIR=${WRKINST}/${PREFIX}/share/examples/munin/www \
CGIDIR=${WRKINST}/${PREFIX}/share/examples/munin/www \
Index: net/net-snmp/Makefile
===================================================================
RCS file: /cvs/ports/net/net-snmp/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- net/net-snmp/Makefile 7 Sep 2020 10:18:14 -0000 1.116
+++ net/net-snmp/Makefile 31 Jul 2021 00:01:45 -0000
@@ -31,6 +31,8 @@ MAINTAINER= Stuart Henderson <stu.ports@
# BSD
PERMIT_PACKAGE= Yes
+MODULES= perl
+
WANTLIB-main= c crypto curses kvm m perl
FLAVORS= readonly
Index: net/rrdtool/Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile
--- net/rrdtool/Makefile 28 Oct 2020 12:12:46 -0000 1.118
+++ net/rrdtool/Makefile 31 Jul 2021 00:01:45 -0000
@@ -29,7 +29,7 @@ USE_GMAKE= Yes
PSEUDO_FLAVORS= no_ruby
MULTI_PACKAGES= -main -ruby -update
-MODULES= lang/ruby
+MODULES= lang/ruby perl
CONFIGURE_STYLE= gnu
CPPFLAGS+= -I${X11BASE}/include/ \
Index: print/foomatic-db-engine/Makefile
===================================================================
RCS file: /cvs/ports/print/foomatic-db-engine/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- print/foomatic-db-engine/Makefile 12 Jul 2019 20:48:55 -0000 1.43
+++ print/foomatic-db-engine/Makefile 31 Jul 2021 00:01:45 -0000
@@ -13,6 +13,8 @@ MAINTAINER= Antoine Jacoutot <ajacoutot
# GPLv2
PERMIT_PACKAGE= Yes
+MODULES = perl
+
WANTLIB += c iconv m lzma pthread xml2 z
MASTER_SITES= https://www.openprinting.org/download/foomatic/
Index: sysutils/stow/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/stow/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- sysutils/stow/Makefile 21 Aug 2019 10:39:29 -0000 1.16
+++ sysutils/stow/Makefile 31 Jul 2021 00:01:45 -0000
@@ -14,8 +14,11 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_GNU:=stow/}
+MODULES= perl
CONFIGURE_STYLE=gnu
USE_GMAKE= Yes
+
+CONFIGURE_ARGS= --with-pmdir=${LOCALBASE}/${P5SITE}
TEST_DEPENDS= devel/p5-IO-stringy \
devel/p5-Test-Output
Index: textproc/link-grammar/Makefile
===================================================================
RCS file: /cvs/ports/textproc/link-grammar/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- textproc/link-grammar/Makefile 23 Feb 2021 19:39:45 -0000 1.61
+++ textproc/link-grammar/Makefile 31 Jul 2021 00:01:45 -0000
@@ -35,7 +35,7 @@ WANTLIB-python += iconv intl link-gramma
MASTER_SITES =
http://www.abisource.com/downloads/link-grammar/${VERSION}/
-MODULES = lang/python
+MODULES = lang/python perl
MODPY_ADJ_FILES = bindings/python-examples/tests.py
Index: textproc/redland-bindings/Makefile
===================================================================
RCS file: /cvs/ports/textproc/redland-bindings/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- textproc/redland-bindings/Makefile 23 Feb 2021 19:39:46 -0000 1.22
+++ textproc/redland-bindings/Makefile 31 Jul 2021 00:01:45 -0000
@@ -19,6 +19,8 @@ MASTER_SITES= http://download.librdf.or
# LGPL 2.1, or Apache 2
PERMIT_PACKAGE= Yes
+MODULES += perl
+
WANTLIB += rdf
WANTLIB-main = ${WANTLIB} c perl # uses perl ABI
Index: www/llgal/Makefile
===================================================================
RCS file: /cvs/ports/www/llgal/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/llgal/Makefile 12 Jul 2019 20:50:48 -0000 1.15
+++ www/llgal/Makefile 31 Jul 2021 00:01:45 -0000
@@ -14,6 +14,8 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= https://github.com/bgoglin/llgal/archive/
+MODULES= perl
+
BUILD_DEPENDS= devel/gettext,-tools
RUN_DEPENDS= graphics/ImageMagick \
Index: www/p5-libapreq2/Makefile
===================================================================
RCS file: /cvs/ports/www/p5-libapreq2/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- www/p5-libapreq2/Makefile 23 Mar 2021 15:07:46 -0000 1.22
+++ www/p5-libapreq2/Makefile 31 Jul 2021 00:01:45 -0000
@@ -3,7 +3,7 @@
COMMENT= apache HTTP server request library
DISTNAME= libapreq2-2.16
-# can't use perl module with autoconf; p5- prefix added manually here
+# can't use cpan module with autoconf; p5- prefix added manually here
PKGNAME= p5-${DISTNAME}
CATEGORIES= www
@@ -11,6 +11,8 @@ SHARED_LIBS= apreq2 9.0
# Artistic + GPL
PERMIT_PACKAGE= Yes
+
+MODULES = perl
WANTLIB += apr-1 aprutil-1 c db expat iconv perl pthread
Index: graphics/GraphicsMagick/Makefile
===================================================================
RCS file: /cvs/ports/graphics/GraphicsMagick/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- graphics/GraphicsMagick/Makefile 23 Jan 2021 09:23:08 -0000 1.65
+++ graphics/GraphicsMagick/Makefile 31 Jul 2021 00:01:45 -0000
@@ -60,7 +60,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE
ac_cv_path_LaunchDelegate=no
post-build:
- @cd ${WRKBUILD}/PerlMagick && perl Makefile.PL && \
+ @cd ${WRKBUILD}/PerlMagick && perl Makefile.PL INSTALLDIRS=vendor && \
sed -i s,'^LDLOADLIBS = ','LDLOADLIBS = -lGraphicsMagick ', \
Makefile && ${MAKE} ${MAKE_FLAGS}
Index: net/libproxy/Makefile
===================================================================
RCS file: /cvs/ports/net/libproxy/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- net/libproxy/Makefile 8 Mar 2021 12:32:27 -0000 1.69
+++ net/libproxy/Makefile 31 Jul 2021 00:01:45 -0000
@@ -60,6 +60,7 @@ CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLA
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DWITH_PERL:BOOL=ON \
-DPERL_LINK_LIBPERL:BOOL=ON \
+ -DPERL_VENDORINSTALL=ON \
-DWITH_GNOME3:BOOL=ON \
-DWITH_VALA:BOOL=ON \
-DWITH_DOTNET:BOOL=OFF \
