[Midnightbsd-cvs] mports: lang/perl5.8: No longer spam make.conf - this is needed by
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Mon Jun 9 16:20:12 EDT 2008
Log Message:
-----------
No longer spam make.conf - this is needed by freebsd for versions that have
perl in base.
USE_PERL5 to pull in the extension, like the 5.10 port.
Modified Files:
--------------
mports/lang/perl5.8:
Makefile (r1.11 -> r1.12)
mports/lang/perl5.8/files:
pkg-glue (r1.3 -> r1.4)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/perl5.8/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L lang/perl5.8/Makefile -L lang/perl5.8/Makefile -u -r1.11 -r1.12
--- lang/perl5.8/Makefile
+++ lang/perl5.8/Makefile
@@ -8,6 +8,7 @@
PORTNAME= perl
PORTVERSION= 5.8.8
+PORTREVISION= 1
CATEGORIES= lang devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -25,30 +26,12 @@
LICENSE= perl
COMMENT= Practical Extraction and Report Language
-#
-# MPORT_MAINTAINER_MODE depends on perl scripts. Make sure it is unset for this port.
-#
-.undef MPORT_MAINTAINER_MODE
-
-
-#
-# We have to define these vars ourselves, if we use bsd.perl.mk, we create a cirular
-# dependancy.
-#
PERL_VER= ${PORTVERSION}
-PERL_VERSION= ${PERL_VER}
-PERL_ARCH?= mach
-SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER}
-SITE_PERL?= ${PREFIX}/${SITE_PERL_REL}
-PERL5= ${PREFIX}/bin/perl${PERL_VERSION}
-PERL= ${PREFIX}/bin/perl
-
+PERL_VERSION= ${PORTVERSION}
-PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
- PERL_VER=${PERL_VER} \
- PERL_ARCH=${PERL_ARCH} \
- SITE_PERL=${SITE_PERL_REL}
+PERL_NO_DEPENDS= yes
+USE_PERL5= yes
USE_BZIP2= yes
Index: pkg-glue
===================================================================
RCS file: /home/cvs/mports/lang/perl5.8/files/pkg-glue,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lang/perl5.8/files/pkg-glue -L lang/perl5.8/files/pkg-glue -u -r1.3 -r1.4
--- lang/perl5.8/files/pkg-glue
+++ lang/perl5.8/files/pkg-glue
@@ -10,17 +10,16 @@
banner=`date +"%F %T"`
banner="# added by perl $banner"
+# We still cleanup make.conf in case the user had something old in there.
if [ "$2" = "POST-INSTALL" ] ; then
need_remove_links=yes
need_create_links=yes
need_cleanup_make_conf=yes
need_cleanup_manpath=yes
- need_spam_make_conf=yes
need_spam_manpath=yes
need_post_install=yes
elif [ "$2" = "POST-DEINSTALL" ] ; then
need_remove_links=yes
- need_cleanup_make_conf=yes
need_cleanup_manpath=yes
else
exit 0;
@@ -103,14 +102,6 @@
echo " Done."
}
-do_spam_make_conf()
-{
- echo -n "Spamming ${MAKE_CONF}..."
- echo "$banner" >>${MAKE_CONF}
- echo "PERL_VER=$PERL_VERSION" >>${MAKE_CONF}
- echo "PERL_VERSION=$PERL_VERSION" >>${MAKE_CONF}
- echo " Done."
-}
do_spam_manpath()
{
@@ -125,7 +116,6 @@
[ $need_create_links ] && do_create_links
[ $need_post_install ] && do_post_install
[ $need_cleanup_make_conf ] && do_cleanup_make_conf
-[ $need_spam_make_conf ] && do_spam_make_conf
[ $need_cleanup_manpath ] && do_cleanup_manpath
[ $need_spam_manpath ] && do_spam_manpath
More information about the Midnightbsd-cvs
mailing list