pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Drop the perl-5.6.x package from pkgsrc. Remove lang/...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2ab50f23d6d4
branches: trunk
changeset: 496177:2ab50f23d6d4
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jun 24 06:43:43 2005 +0000
description:
Drop the perl-5.6.x package from pkgsrc. Remove lang/perl58 and update
lang/perl5 to perl-5.8.6nb4. Modify packages that referred to
lang/perl58 to point to lang/perl5 instead.
diffstat:
comms/pilotmgr/Makefile | 4 +-
databases/p5-MLDBM/Makefile | 4 +-
databases/p5-gdbm/Makefile | 22 +-
devel/p5-Test-Harness/depends.mk | 4 +-
doc/CHANGES | 4 +-
lang/Makefile | 3 +-
lang/perl5/MESSAGE | 2 +-
lang/perl5/Makefile | 285 ++++++++++++++++++++++++--------------
lang/perl5/Makefile.common | 12 -
lang/perl5/PLIST | 5 +-
lang/perl5/buildlink3.mk | 4 +-
lang/perl5/distinfo | 42 +++--
lang/perl5/hacks.mk | 72 +++++++++
lang/perl5/patches/patch-aa | 140 ++++++------------
lang/perl5/patches/patch-ac | 20 --
lang/perl5/patches/patch-ad | 51 ------
lang/perl5/patches/patch-ae | 61 +------
lang/perl5/patches/patch-af | 35 ----
lang/perl5/patches/patch-ag | 86 -----------
lang/perl5/patches/patch-ah | 44 +++--
lang/perl5/patches/patch-aj | 31 ----
lang/perl5/patches/patch-al | 32 ----
lang/perl5/patches/patch-am | 53 -------
lang/perl5/patches/patch-ba | 111 +++++++-------
lang/perl5/patches/patch-bb | 32 ----
lang/perl5/patches/patch-bc | 15 --
lang/perl5/patches/patch-bd | 28 +++
lang/perl5/patches/patch-be | 24 +++
lang/perl5/patches/patch-bf | 24 +++
lang/perl5/patches/patch-ca | 66 ++++++++-
lang/perl5/patches/patch-cb | 25 +++
lang/perl5/patches/patch-cc | 32 ++++
lang/perl5/patches/patch-cd | 12 +
lang/perl5/patches/patch-ce | 12 +
lang/perl5/patches/patch-cf | 12 +
lang/perl5/patches/patch-cg | 13 +
lang/perl5/patches/patch-ch | 13 +
lang/perl5/patches/patch-ci | 18 ++
lang/perl5/patches/patch-cj | 123 ++++++++++++++++
lang/perl5/patches/patch-ck | 25 +++
lang/perl5/patches/patch-cl | 21 ++
lang/perl5/patches/patch-zc | 36 ++++
lang/perl58/DESCR | 11 -
lang/perl58/MESSAGE | 9 -
lang/perl58/Makefile | 285 ---------------------------------------
lang/perl58/PLIST | 5 -
lang/perl58/distinfo | 25 ---
lang/perl58/hacks.mk | 72 ---------
lang/perl58/patches/patch-aa | 50 ------
lang/perl58/patches/patch-ae | 12 -
lang/perl58/patches/patch-ah | 67 ---------
lang/perl58/patches/patch-ba | 59 --------
lang/perl58/patches/patch-bd | 28 ---
lang/perl58/patches/patch-be | 24 ---
lang/perl58/patches/patch-bf | 24 ---
lang/perl58/patches/patch-ca | 79 ----------
lang/perl58/patches/patch-cb | 25 ---
lang/perl58/patches/patch-cc | 32 ----
lang/perl58/patches/patch-cd | 12 -
lang/perl58/patches/patch-ce | 12 -
lang/perl58/patches/patch-cf | 12 -
lang/perl58/patches/patch-cg | 13 -
lang/perl58/patches/patch-ch | 13 -
lang/perl58/patches/patch-ci | 18 --
lang/perl58/patches/patch-cj | 123 ----------------
lang/perl58/patches/patch-ck | 25 ---
lang/perl58/patches/patch-cl | 21 --
lang/perl58/patches/patch-zc | 36 ----
mk/bulk/bsd.bulk-pkg.mk | 4 +-
mk/platform/Interix.mk | 4 +-
mk/tools/replace.mk | 6 +-
net/p5-Net-Daemon/Makefile | 4 +-
72 files changed, 930 insertions(+), 1838 deletions(-)
diffs (truncated from 3321 to 300 lines):
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 comms/pilotmgr/Makefile
--- a/comms/pilotmgr/Makefile Fri Jun 24 06:03:59 2005 +0000
+++ b/comms/pilotmgr/Makefile Fri Jun 24 06:43:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/06/24 06:43:43 jlam Exp $
DISTNAME= pilotmgr-1.107p2
PKGNAME= pilotmgr-1.107.2
@@ -14,7 +14,7 @@
DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
DEPENDS+= p5-Tk-[0-9]*:../../x11/p5-Tk
DEPENDS+= p5-pilot-link-[0-9]*:../p5-pilot-link
-DEPENDS+= {p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:../../lang/perl58
+DEPENDS+= {p5-Data-Dumper-[0-9]*,perl>=5.6.1nb2}:../../lang/perl5
WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*$//}
HAS_CONFIGURE= YES
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 databases/p5-MLDBM/Makefile
--- a/databases/p5-MLDBM/Makefile Fri Jun 24 06:03:59 2005 +0000
+++ b/databases/p5-MLDBM/Makefile Fri Jun 24 06:43:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/19 15:26:03 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/24 06:43:43 jlam Exp $
#
DISTNAME= MLDBM-2.01
@@ -12,7 +12,7 @@
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/MLDBM/MLDBM.html
COMMENT= Perl5 module for storing arbitrary data in tied hashes
-DEPENDS+= {p5-Data-Dumper>=2.08,perl{,-thread}>=5.6.1nb2}:../../lang/perl58
+DEPENDS+= {p5-Data-Dumper>=2.08,perl{,-thread}>=5.6.1nb2}:../../lang/perl5
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 databases/p5-gdbm/Makefile
--- a/databases/p5-gdbm/Makefile Fri Jun 24 06:03:59 2005 +0000
+++ b/databases/p5-gdbm/Makefile Fri Jun 24 06:43:43 2005 +0000
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:13 tv Exp $
-
-.include "../../lang/perl5/Makefile.common"
+# $NetBSD: Makefile,v 1.26 2005/06/24 06:43:43 jlam Exp $
-PKGNAME= p5-gdbm-1.05
-PKGREVISION= 3
-SVR4_PKGNAME= p5gdm
-CATEGORIES+= databases
+DISTNAME= perl-5.6.1
+PKGNAME= p5-gdbm-1.05
+SVR4_PKGNAME= p5gdm
+PKGREVISION= 3
+CATEGORIES= databases perl5
+MASTER_SITES+= ftp://cpan.teleglobe.net/pub/CPAN/src/5.0/maint/ \
+ ftp://perl.secsup.org/pub/perl/src/5.0/maint/ \
+ ftp://ftp.lug.udel.edu/pub/CPAN/src/5.0/maint/ \
+ ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/maint/ \
+ ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/maint/
MAINTAINER= tech-pkg%NetBSD.org@localhost
COMMENT= Perl interface to gdbm - GNU database manager
+EXTRACT_ELEMENTS= ${DISTNAME}/ext/GDBM_File
WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
+
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/GDBM_File/.packlist
-EXTRACT_ELEMENTS= ${DISTNAME}/ext/GDBM_File
-
.include "../../databases/gdbm/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 devel/p5-Test-Harness/depends.mk
--- a/devel/p5-Test-Harness/depends.mk Fri Jun 24 06:03:59 2005 +0000
+++ b/devel/p5-Test-Harness/depends.mk Fri Jun 24 06:43:43 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: depends.mk,v 1.5 2005/05/19 15:35:41 jlam Exp $
+# $NetBSD: depends.mk,v 1.6 2005/06/24 06:43:44 jlam Exp $
.include "../../mk/bsd.prefs.mk"
-# perl58>=5.8.3 includes Test::Harness, so we allow it to satisfy this
+# perl>=5.8.3 includes Test::Harness, so we allow it to satisfy this
# dependency.
#
# This does however cause problems for the bulk-builds; it adds all
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 doc/CHANGES
--- a/doc/CHANGES Fri Jun 24 06:03:59 2005 +0000
+++ b/doc/CHANGES Fri Jun 24 06:43:43 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10422 2005/06/24 06:03:59 grant Exp $
+$NetBSD: CHANGES,v 1.10423 2005/06/24 06:43:44 jlam Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -2972,3 +2972,5 @@
Removed lang/libperl [jlam 2005-06-24]
Updated mail/clamav to 0.86.1 [grant 2005-06-24]
Updated mail/p5-Mail-ClamAV to 0.17 [grant 2005-06-24]
+ Removed lang/perl58 [jlam 2005-06-24]
+ Updated lang/perl5 to perl-5.8.6nb4 [jlam 2005-06-24]
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 lang/Makefile
--- a/lang/Makefile Fri Jun 24 06:03:59 2005 +0000
+++ b/lang/Makefile Fri Jun 24 06:43:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.216 2005/06/24 05:56:26 jlam Exp $
+# $NetBSD: Makefile,v 1.217 2005/06/24 06:43:44 jlam Exp $
#
COMMENT= Programming languages
@@ -97,7 +97,6 @@
SUBDIR+= p2c
SUBDIR+= parrot
SUBDIR+= perl5
-SUBDIR+= perl58
SUBDIR+= pforth
#SUBDIR+= php # only contains Makefile fragments
#SUBDIR+= php5 # only contains Makefile fragments
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 lang/perl5/MESSAGE
--- a/lang/perl5/MESSAGE Fri Jun 24 06:03:59 2005 +0000
+++ b/lang/perl5/MESSAGE Fri Jun 24 06:43:43 2005 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/01/08 19:18:00 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2005/06/24 06:43:45 jlam Exp $
${PKGNAME} will use the following directory as the default
location of the site-specific Perl modules:
diff -r 4aa0a3eec5b2 -r 2ab50f23d6d4 lang/perl5/Makefile
--- a/lang/perl5/Makefile Fri Jun 24 06:03:59 2005 +0000
+++ b/lang/perl5/Makefile Fri Jun 24 06:43:43 2005 +0000
@@ -1,26 +1,49 @@
-# $NetBSD: Makefile,v 1.92 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.93 2005/06/24 06:43:45 jlam Exp $
-.include "../../lang/perl5/Makefile.common"
+# The following two variables should have empty values unless we're
+# building a perl snapshot or release candidate.
+#
+PERL5_SNAPSHOT= # empty
+PERL5_RC_VERS= # empty
-PKGREVISION= 11
-CATEGORIES+= lang devel
+PERL5_VERS= 5.8.6
+CATEGORIES= lang devel perl5
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://www.perl.com/
-COMMENT= Practical Extraction and Report Language
+.if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
+DISTNAME= perl-${PERL5_VERS}
+PKGNAME= perl-${PERL5_VERS}
+PKGREVISION= 4
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
+.else
+. if !empty(PERL5_SNAPSHOT)
+DISTNAME= perl@${PERL5_SNAPSHOT}
+PKGNAME= perl-${PERL5_VERS}beta${PERL5_SNAPSHOT}
+MASTER_SITES= http://www.iki.fi/jhi/
+EXTRACT_SUFX= .tbz
+WRKSRC= ${WRKDIR}/perl
+. else # !empty(PERL5_RC_VERS)
+DISTNAME= perl-${PERL5_VERS}-RC${PERL5_RC_VERS}
+PKGNAME= perl-${PERL5_VERS}rc${PERL5_RC_VERS}
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/${MODULE_DIR}/${AUTHOR_DIR}/}
+MODULE_DIR= modules/by-module
+AUTHOR_DIR= authors/id/J/JH/JHI
+. endif
+.endif
-CONFLICTS= perl-5.00* perl-base-[0-9]* \
- p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] \
- p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
- p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
- perl-mk-[0-9]*
+MAINTAINER= jlam%NetBSD.org@localhost
+HOMEPAGE= http://www.perl.com/
+COMMENT= Practical Extraction and Report Language
-NOT_FOR_PLATFORM= Darwin-*-* Interix-*-*
+CONFLICTS= perl-5.00* perl-base-[0-9]* \
+ p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] \
+ p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
+ p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
+ perl-mk-[0-9]* perl-thread-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILDING_PERL5= yes
-PERL5_CONFIGURE= no
+.include "../../mk/compiler.mk"
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
@@ -28,15 +51,16 @@
CONFIGURE_ARGS+= -Dprefix="${PREFIX}"
CONFIGURE_ARGS+= -Dscriptdir="${PREFIX}/bin"
CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
+CONFIGURE_ARGS+= -Dcc="${CC}"
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
-CONFIGURE_ARGS+= -Dcc="${CC:T}"
CONFIGURE_ARGS+= -Dinstallstyle="lib/perl5"
+CONFIGURE_ARGS+= -Duseshrplib
CONFIGURE_ARGS+= -Ui_malloc
CONFIGURE_ARGS+= -Uusemymalloc
CONFIGURE_ARGS+= -Uinstallusrbinperl
-TEST_TARGET= test
+MAKE_ENV+= LC_ALL="C"
-CONFIGURE_ARGS+= -Dman1dir="${PREFIX}/man/man1"
+TEST_TARGET= test
# Install Perl man3 pages into a private directory under the normal
# Perl installation. Also install site-specific Perl man3 pages into a
@@ -44,41 +68,62 @@
# between 3rd-party modules, the standard Perl library, and other
# packages.
#
+CONFIGURE_ARGS+= -Dman3ext="3"
CONFIGURE_ARGS+= -Dman3dir="${PERL5_PRIVLIB}/man/man3"
-CONFIGURE_ARGS+= -Dinstallsiteman3dir="${PERL5_SITEPERL}/man/man3"
+CONFIGURE_ARGS+= -Dsiteman3dir="${PERL5_SITEPERL}/man/man3"
+
+# Ensure that the Perl man1 pages go into ${PREFIX}/man/man1 and not
+# into some other platform-specific location kindly "guessed" by the
+# Configure script.
+#
+CONFIGURE_ARGS+= -Dman1dir="${PREFIX}/man/man1"
# The site directories are all relative to the perl view.
CONFIGURE_ARGS+= -Dsiteprefix="${VIEWBASE}"
-CONFIGURE_ARGS+= -Dinstallsiteman1dir="${VIEWBASE}/man/man1"
+CONFIGURE_ARGS+= -Dsiteman1dir="${VIEWBASE}/man/man1"
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-
-MKPIC?= yes
-.if ${OPSYS} == "IRIX" && ${ABI} == "64"
-CONFIGURE_ARGS+= -Duse64bitint
+.if ${OPSYS} == "Darwin"
+#
+# The perl build attempts to work around case-insensitivity problems on
+# HFS filesystems by using GNUmakefiles, so we need to use GNU make.
+#
+USE_TOOLS+= gmake
.endif
+# Perl embeds the full paths to the following tools in several installed
+# files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used.
+#
+USE_TOOLS+= hostname ln sed
+CONFIGURE_ARGS+= -Daphostname=${TOOLS_HOSTNAME_CMD:Q}
+CONFIGURE_ARGS+= -Dln=${TOOLS_LN:Q}
+CONFIGURE_ARGS+= -Dsed=${TOOLS_SED:Q}
+
# Nail down the needed libraries for each platform here to avoid hidden
# dependencies. If this isn't defined, then use the perl defaults for the
# particular operating system.
#
-LIBSWANTED.BSDOS= m crypt dl bind
+LIBSWANTED.Darwin= m c
LIBSWANTED.FreeBSD= m crypt
LIBSWANTED.IRIX= m crypt
+LIBSWANTED.Interix= m dl
LIBSWANTED.NetBSD= m crypt
LIBSWANTED.OpenBSD= m crypt
LIBSWANTED.SunOS= m crypt dl socket nsl
+LIBSWANTED= ${LIBSWANTED.${OPSYS}}
# Nail down the directories in which the system libraries may be found.
# If this isn't defined, then use the perl defaults for the particular
# operating system.
#
-SYSLIBPATH.BSDOS= /usr/lib
+SYSLIBPATH.Darwin= /usr/lib
+SYSLIBPATH.FreeBSD= /usr/lib
+SYSLIBPATH.Interix= /usr/lib
SYSLIBPATH.NetBSD= /usr/lib
SYSLIBPATH.OpenBSD= /usr/lib
SYSLIBPATH.SunOS= /usr/lib
+SYSLIBPATH= ${SYSLIBPATH.${OPSYS}}
# Nail down the directories in which headers and libraries of
# locally-installed software may be found.
@@ -92,45 +137,81 @@
#
.if ${OBJECT_FMT} == "a.out"
LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g}
+.elif ${OBJECT_FMT} == "ELF"
+LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g}
.else
-LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g}
+LOCLIBRPATHFLAGS= # empty
.endif
-FIX_RPATH+= LOCLIBRPATHFLAGS
Home |
Main Index |
Thread Index |
Old Index