Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jan 2001 17:08:47 -0800 (PST)
From:      joseph@randomnetworks.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/24119: PORT - UPDATE : shells/perlsh 0.007 -> 0.009
Message-ID:  <200101070108.f0718lO20935@rodan.randomnetworks.com>
Resent-Message-ID: <200101070120.f071K1I80660@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         24119
>Category:       ports
>Synopsis:       PORT - UPDATE : shells/perlsh 0.007 -> 0.009
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 06 17:20:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Joseph Scott
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
randomnetworks.com
>Environment:

ports collection

>Description:

PORT - UPDATE : shells/perlsh 0.007 -> 0.009

In addition :
- Bring in the MAN3 items into the Makefile
- Fix the plist
- Start ordering plist a little better, likely still needs work on the order
- Get port to respect PREFIX, see note below

** NOTE **
It looks like the 0.007 version of this port didn't respect PREFIX, and
0.009 didn't want to either.  I tried to get MakeMaker to deal with this
nicely, but I ended up having to beat it with a stick in the end :-(

I would be thrilled if someone who knows more about MakeMaker could come up
with a better way to do this.  For now what I've included seems to work.

>How-To-Repeat:


>Fix:

This diff was generated by: diff -ruN perlsh perlsh.new
From: /usr/ports/shells
Patch also at: http://www.randomnetworks.com/freebsd/prs/perlsh.diff
------------------------------------------------------------------------------
diff -ruN perlsh/Makefile perlsh.new/Makefile
--- perlsh/Makefile	Fri Jan  5 18:53:37 2001
+++ perlsh.new/Makefile	Sat Jan  6 16:35:12 2001
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	perlsh
-PORTVERSION=	0.007
+PORTVERSION=	0.009
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.focusresearch.com/gregor/psh/
 DISTNAME=	psh-${PORTVERSION}
@@ -14,17 +14,38 @@
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
-FETCH_BEFORE_ARGS+=	-t
-MAKE_ENV+=	PPREFIX="${PREFIX}"
-MAN1=		psh.1
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+PERL_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/man3"
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN1=		psh.1 pshdevel.1
+MAN3=	Psh::Builtins.3 \
+	Psh::Completion.3 \
+	Psh::Job.3 \
+	Psh::Joblist.3 \
+	Psh::Locale::Base.3 \
+	Psh::Locale::Default.3 \
+	Psh::Locale::French.3 \
+	Psh::Locale::German.3 \
+	Psh::Locale::Italian.3 \
+	Psh::Locale::Portuguese.3 \
+	Psh::Locale::Spanish.3 \
+	Psh::OS.3 \
+	Psh::OS::Mac.3 \
+	Psh::OS::Unix.3 \
+	Psh::OS::Win.3 \
+	Psh::PCompletion.3 \
+	Psh::Parser.3 \
+	Psh::PerlEval.3 \
+	Psh::Util.3
 
-do-build:
-	@(cd ${WRKSRC} && ${PERL} Makefile.PL && ${MAKE})
+pre-install:
+	${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile;
+	${PERL} -pi -e "s:/usr/local/man/man1:${MAN3PREFIX}/man/man1:g" ${WRKSRC}/Makefile;
+	${PERL} -pi -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile;
 
 post-install:  
+	${MV} ${PREFIX}/man/man1/psh.pod1 ${PREFIX}/man/man1/psh.1
+	${MV} ${PREFIX}/man/man1/pshdevel.pod1 ${PREFIX}/man/man1/pshdevel.1
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \
diff -ruN perlsh/distinfo perlsh.new/distinfo
--- perlsh/distinfo	Mon Feb 28 18:27:00 2000
+++ perlsh.new/distinfo	Fri Jan  5 15:57:50 2001
@@ -1 +1 @@
-MD5 (psh-0.007.tar.gz) = caae93083d1cf5724b9e7d5864ba1d2c
+MD5 (psh-0.009.tar.gz) = a6d9dd7dc80ceb7ac63203bda7976622
diff -ruN perlsh/files/man3 perlsh.new/files/man3
--- perlsh/files/man3	Mon Feb 28 18:27:00 2000
+++ perlsh.new/files/man3	Wed Dec 31 16:00:00 1969
@@ -1,19 +0,0 @@
-MAN3=	\
-	Psh::OS::Unix.3 \
-	Psh::Locale::French.3 \
-	Psh::Locale::Spanish.3 \
-	Psh::Joblist.3 \
-	Psh::Locale::German.3 \
-	Psh::Locale::Base.3 \
-	Psh::Completion.3 \
-	Psh::PerlEval.3 \
-	Psh::Job.3 \
-	Psh::Util.3 \
-	Psh::OS::Win.3 \
-	Psh::Locale::Italian.3 \
-	Psh::OS.3 \
-	Psh::OS::Mac.3 \
-	Psh::Locale::Default.3 \
-	Psh::Builtins.3 \
-	Psh::Parser.3 \
-	Psh::Locale::Portuguese.3
diff -ruN perlsh/files/patch-aa perlsh.new/files/patch-aa
--- perlsh/files/patch-aa	Mon Feb 28 18:27:01 2000
+++ perlsh.new/files/patch-aa	Sat Jan  6 13:50:18 2001
@@ -1,10 +1,10 @@
---- Makefile.PL	Mon Dec 27 06:11:05 1999
-+++ Makefile.PL.new	Sun Feb 27 22:34:55 2000
-@@ -17,6 +17,7 @@
+--- Makefile.PL	Tue Mar 14 05:29:39 2000
++++ Makefile.PL.new	Fri Jan  5 16:36:49 2001
+@@ -25,6 +25,7 @@
  
  WriteMakefile (
  	NAME         => 'psh',
-+	PREFIX	     => '${PPREFIX}',
++	PREFIX       => '${PREFIX}',
  	VERSION_FROM => 'psh',
  	AUTHOR       => 'Gregor N. Purdy (gregor@focusresearch.com)',
  	ABSTRACT     => 'Perl Shell',
diff -ruN perlsh/pkg-plist perlsh.new/pkg-plist
--- perlsh/pkg-plist	Mon Feb 28 18:27:02 2000
+++ perlsh.new/pkg-plist	Sat Jan  6 16:06:08 2001
@@ -1,24 +1,36 @@
 bin/psh
 lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Unix.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Win.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fc.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Firsttime.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Function.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/History.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Pshtokenize.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Rename.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Set.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Source.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Strategy.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Completion.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Base.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Italian.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Default.pm
@@ -28,6 +40,7 @@
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Portuguese.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/PerlEval.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Debug.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Fallback_builtin.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_resume.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101070108.f0718lO20935>