summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/ices-mp3/Makefile7
-rw-r--r--databases/postgresql73-plperl/Makefile6
-rw-r--r--databases/postgresql74-plperl/Makefile5
-rw-r--r--doc/CHANGES3
-rw-r--r--lang/Makefile3
-rw-r--r--lang/libperl/DESCR14
-rw-r--r--lang/libperl/Makefile44
-rw-r--r--lang/libperl/PLIST2
-rw-r--r--lang/libperl/buildlink3.mk20
-rw-r--r--lang/libperl/distinfo5
-rw-r--r--textproc/eperl/Makefile5
-rw-r--r--www/ap-perl/Makefile20
12 files changed, 23 insertions, 111 deletions
diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile
index 934f623d25e..800cbf8eee7 100644
--- a/audio/ices-mp3/Makefile
+++ b/audio/ices-mp3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/24 05:56:25 jlam Exp $
#
DISTNAME= ices-${ICES_VERSION}
PKGNAME= ices-mp3-${ICES_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
ICES_VERSION= 0.4
CATEGORIES= audio
MASTER_SITES= http://svn.xiph.org/releases/ices/
@@ -58,7 +58,8 @@ do-install:
.include "../../audio/libshout/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.if defined(ICES_USE_PERL) && (${ICES_USE_PERL} == "YES")
-.include "../../lang/libperl/buildlink3.mk"
+PERL5_REQD+= 5.8.0
+.include "../../lang/perl5/buildlink3.mk"
CONFIGURE_ARGS+= --with-perl=${PERL5}
.endif
.if defined(ICES_USE_PYTHON) && (${ICES_USE_PYTHON} == "YES")
diff --git a/databases/postgresql73-plperl/Makefile b/databases/postgresql73-plperl/Makefile
index 82cb8f83d5b..5766e719936 100644
--- a/databases/postgresql73-plperl/Makefile
+++ b/databases/postgresql73-plperl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/24 05:56:25 jlam Exp $
PKGNAME= postgresql73-plperl-${BASE_VERS}
+PKGREVISION= 1
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server
@@ -13,8 +14,9 @@ CONFIGURE_ARGS+= --with-perl
BUILD_DIRS= ${WRKSRC}/src/pl/plperl
MAKEFILE= GNUmakefile
+PERL5_REQD+= 5.8.0
.include "../postgresql73-lib/buildlink3.mk"
-.include "../../lang/libperl/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql74-plperl/Makefile b/databases/postgresql74-plperl/Makefile
index e9700484bc4..8b8b3a4b539 100644
--- a/databases/postgresql74-plperl/Makefile
+++ b/databases/postgresql74-plperl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/24 05:56:25 jlam Exp $
PKGNAME= postgresql74-plperl-${BASE_VERS}
+PKGREVISION= 1
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server
@@ -14,11 +15,11 @@ CONFIGURE_ARGS+= --with-perl
BUILD_DIRS= ${WRKSRC}/src/pl/plperl
MAKEFILE= GNUmakefile
+PERL5_REQD+= 5.8.0
PERL5_CONFIGURE= NO
.include "../postgresql74-lib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../lang/libperl/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/doc/CHANGES b/doc/CHANGES
index ad93e8612df..edd4fb7f868 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10420 2005/06/23 23:53:06 minskim Exp $
+$NetBSD: CHANGES,v 1.10421 2005/06/24 05:56:25 jlam Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -2969,3 +2969,4 @@ Changes to the packages collection and infrastructure in 2005:
Updated news/inn to 2.4.1nb3 [kristerw 2005-06-23]
Updated net/freewais-sf to 2.2.12nb3 [kristerw 2005-06-23]
Added devel/py-ZopeInterface version 3.0.1 [minskim 2005-06-23]
+ Removed lang/libperl [jlam 2005-06-24]
diff --git a/lang/Makefile b/lang/Makefile
index 70bc3af75d7..8c84511df99 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.215 2005/06/23 03:04:00 jonb Exp $
+# $NetBSD: Makefile,v 1.216 2005/06/24 05:56:26 jlam Exp $
#
COMMENT= Programming languages
@@ -76,7 +76,6 @@ SUBDIR+= kaffe-esound
SUBDIR+= kaffe-x11
SUBDIR+= kali
SUBDIR+= ksi
-SUBDIR+= libperl
SUBDIR+= librep
SUBDIR+= libtcl-nothread
SUBDIR+= lua
diff --git a/lang/libperl/DESCR b/lang/libperl/DESCR
deleted file mode 100644
index bd04f5c2d39..00000000000
--- a/lang/libperl/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Perl is a high-level programming language with an eclectic heritage
-written by Larry Wall and a cast of thousands. It derives from the
-ubiquitous C programming language and to a lesser extent from sed, awk,
-the Unix shell, and at least a dozen other tools and languages. Perl's
-process, file, and text manipulation facilities make it particularly
-well-suited for tasks involving quick prototyping, system utilities,
-software tools, system management tasks, database access, graphical
-programming, networking, and world wide web programming. These strengths
-make it especially popular with system administrators and CGI script
-authors, but mathematicians, geneticists, journalists, and even managers
-also use Perl. Maybe you should, too.
-
-This package is contains the Perl DynaLoader built as relocatable shared
-object.
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
deleted file mode 100644
index 865ca63fe05..00000000000
--- a/lang/libperl/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2005/06/16 06:58:00 jlam Exp $
-
-.include "../../lang/perl5/Makefile.common"
-
-PKGNAME= libperl-${PERL5_DIST_VERS}
-SVR4_PKGNAME= lperl
-CATEGORIES+= lang devel
-
-MAINTAINER= jlam@NetBSD.org
-HOMEPAGE= http://language.perl.com/index.html
-COMMENT= Perl DynaLoader as a shared object
-
-CONFLICTS+= perl>=5.8
-
-WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
-EXTRACT_ELEMENTS= ${DISTNAME}/ext/DynaLoader
-
-BUILDLINK_DEPENDS.perl= perl-${PERL5_DIST_VERS}{,nb*}
-BUILDLINK_PKGSRCDIR.perl= ../../lang/perl5
-
-.include "../../mk/bsd.prefs.mk"
-
-MKPIC?= yes
-
-.if ${OPSYS} == "NetBSD"
-. if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
-MKPIC= no
-. endif
-.endif
-
-.if ${MKPIC} == "no"
-PKG_FAIL_REASON= "${PKGNAME} needs shared objects"
-.endif
-
-do-build:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} -f ${MAKEFILE} DynaLoader.o
-
-do-install:
- ${INSTALL_DATA_DIR} ${PERL5_ARCHLIB}
- ${INSTALL_DATA} ${WRKSRC}/DynaLoader.o ${PERL5_ARCHLIB}/DynaLoader_pic.o
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/libperl/PLIST b/lang/libperl/PLIST
deleted file mode 100644
index ae90b448cab..00000000000
--- a/lang/libperl/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:59 zuntum Exp $
-${PERL5_ARCHLIB}/DynaLoader_pic.o
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
deleted file mode 100644
index 9fa24dbdd6e..00000000000
--- a/lang/libperl/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/05/18 22:42:07 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libperl
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibperl}
-BUILDLINK_PACKAGES+= libperl
-
-.if !empty(LIBPERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libperl+= {libperl>=${PERL5_REQD},perl{,-thread}>=5.8.0}
-BUILDLINK_PKGSRCDIR.libperl?= ../../lang/perl58
-.endif # LIBPERL_BUILDLINK3_MK
-
-.include "../../lang/perl5/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/libperl/distinfo b/lang/libperl/distinfo
deleted file mode 100644
index 4cc65ca8ca8..00000000000
--- a/lang/libperl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:03:09 agc Exp $
-
-SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
-RMD160 (perl-5.6.1.tar.gz) = 4062e3d43e7a860197ff73ab5083ddb2e5909cde
-Size (perl-5.6.1.tar.gz) = 5983695 bytes
diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index 12fa74e845b..9df4e4be9a4 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/24 05:56:26 jlam Exp $
DISTNAME= eperl-2.2.14
+PKGREVISION= 1
CATEGORIES= lang perl5 textproc
MASTER_SITES= http://www.engelschall.com/sw/eperl/distrib/
@@ -11,12 +12,12 @@ COMMENT= Interpreter/preprocessor for Perl embedded in text documents
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
GNU_CONFIGURE= YES
+PERL5_REQD+= 5.8.0
PERL5_CONFIGURE= NO
PERL5_CONFIGURE_DIRS= ${WRKSRC}/mod/Parse
BUILD_DIRS= ${WRKSRC} ${WRKSRC}/mod/Parse
post-configure: perl5-configure
-.include "../../lang/libperl/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 8100a14e377..1cbee78fa1c 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/24 05:56:26 jlam Exp $
#
DISTNAME= mod_perl-1.29
PKGNAME= ap-perl-1.29
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \
http://perl.apache.org/dist/
@@ -18,27 +18,19 @@ DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache
DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
APACHE_MODULE= YES
+PERL5_REQD+= 5.8.0
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/mod_perl/.packlist
MAKE_PARAMS+= USE_APXS=1
MAKE_PARAMS+= WITH_APXS=${APXS}
MAKE_PARAMS+= EVERYTHING=1
+.include "../../lang/perl5/module.mk"
+.include "../../www/apache/buildlink3.mk"
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod
${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
${PREFIX}/share/httpd/htdocs/manual/mod
-BUILDLINK_DEPMETHOD.libperl+= build
-.include "../../lang/libperl/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../www/apache/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
-
-.if exists(${PERL5_ARCHLIB}/DynaLoader_pic.o)
-DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/DynaLoader_pic.o
-.elif ${OPSYS} == "NetBSD"
-DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/auto/DynaLoader/DynaLoader.a
-.endif
-MAKE_ENV+= DYNALOADER_OBJ_PIC="${DYNALOADER_OBJ_PIC}"