adding perl to fastcgi

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

adding perl to fastcgi

Marc Balmer-2
oh, and as we have perl in base, why don't you just enable perl by
default instead of creating a FLAVOR?

Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

Adam Montague
Marc Balmer <[hidden email]> wrote:

> oh, and as we have perl in base, why don't you just enable perl by
> default instead of creating a FLAVOR?

There is no FLAVOR, the subpackage you mean?  I wasn't sure if it should
be in a subpackage (and if so, if there should be a no_perl FLAVOR), or
if it should just be built and installed no matter what.  Here's a patch
with it just enabled and installed no matter what.

Thanks
Adam

fcgi.diff (3K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

Marc Balmer-2
* Adam Montague wrote:
> Marc Balmer <[hidden email]> wrote:
>
> > oh, and as we have perl in base, why don't you just enable perl by
> > default instead of creating a FLAVOR?
>
> There is no FLAVOR, the subpackage you mean?  I wasn't sure if it should
> be in a subpackage (and if so, if there should be a no_perl FLAVOR), or
> if it should just be built and installed no matter what.  Here's a patch
> with it just enabled and installed no matter what.

I think this is the best way to do.   Comments from other people?

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/fcgi/Makefile,v
> retrieving revision 1.7
> diff -u -r1.7 Makefile
> --- Makefile 14 Jan 2006 11:46:15 -0000 1.7
> +++ Makefile 6 Nov 2006 01:37:23 -0000
> @@ -3,7 +3,7 @@
>  COMMENT= "FastCGI Development Kit"
>  
>  DISTNAME= fcgi-2.4.0
> -PKGNAME= ${DISTNAME}p1
> +PKGNAME= ${DISTNAME}p2
>  CATEGORIES= www
>  SHARED_LIBS= fcgi++ 1.0 \
>   fcgi 0.0
> @@ -17,7 +17,7 @@
>  PERMIT_PACKAGE_FTP=     Yes
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
> -WANTLIB= c
> +WANTLIB= c
>  
>  MASTER_SITES= ${HOMEPAGE}/dist/
>  
> @@ -28,6 +28,12 @@
>  CAT3_FILES= FCGI_Accept FCGI_Finish FCGI_SetExitStatus \
>   FCGI_StartFilterData
>  
> +post-configure:
> + @cd ${WRKSRC}/perl && perl Makefile.PL
> +
> +post-build:
> + @cd ${WRKSRC}/perl && make
> +
>  post-install:
>   ${INSTALL_MAN} ${WRKSRC}/doc/cgi-fcgi.1 ${PREFIX}/man/cat1/cgi-fcgi.0
>  .for file in ${CAT3_FILES}
> @@ -36,5 +42,6 @@
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fcgi
>   ${INSTALL_DATA} ${WRKSRC}/doc/*.htm* ${WRKSRC}/doc/*.gif \
>   ${PREFIX}/share/doc/fcgi
> + @cd ${WRKSRC}/perl && make install
>  
>  .include <bsd.port.mk>
> Index: pkg/PFRAG.shared
> ===================================================================
> RCS file: /cvs/ports/www/fcgi/pkg/PFRAG.shared,v
> retrieving revision 1.3
> diff -u -r1.3 PFRAG.shared
> --- pkg/PFRAG.shared 30 Dec 2005 22:26:50 -0000 1.3
> +++ pkg/PFRAG.shared 6 Nov 2006 01:37:23 -0000
> @@ -1,3 +1,4 @@
>  @comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/30 22:26:50 sturm Exp $
>  @lib lib/libfcgi++.so.${LIBfcgi++_VERSION}
>  @lib lib/libfcgi.so.${LIBfcgi_VERSION}
> +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/FCGI/FCGI.so
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/fcgi/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -r1.3 PLIST
> --- pkg/PLIST 15 Sep 2004 18:49:49 -0000 1.3
> +++ pkg/PLIST 6 Nov 2006 01:37:23 -0000
> @@ -11,11 +11,17 @@
>  lib/libfcgi++.la
>  lib/libfcgi.a
>  lib/libfcgi.la
> +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
> +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/FCGI.pm
> +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
> +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/FCGI/
> +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/FCGI/FCGI.bs
>  @man man/cat1/cgi-fcgi.0
>  @man man/cat3/FCGI_Accept.0
>  @man man/cat3/FCGI_Finish.0
>  @man man/cat3/FCGI_SetExitStatus.0
>  @man man/cat3/FCGI_StartFilterData.0
> +@man man/man3p/FCGI.3p
>  share/doc/fcgi/
>  share/doc/fcgi/fcgi-devel-kit.htm
>  share/doc/fcgi/fcgi-java.htm

Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

Simon Bertrang
On Mon, Nov 06, 2006 at 08:12:54AM +0100, Marc Balmer wrote:

> * Adam Montague wrote:
> > Marc Balmer <[hidden email]> wrote:
> >
> > > oh, and as we have perl in base, why don't you just enable perl by
> > > default instead of creating a FLAVOR?
> >
> > There is no FLAVOR, the subpackage you mean?  I wasn't sure if it should
> > be in a subpackage (and if so, if there should be a no_perl FLAVOR), or
> > if it should just be built and installed no matter what.  Here's a patch
> > with it just enabled and installed no matter what.
>
> I think this is the best way to do.   Comments from other people?
>

Looks good, compiles and installs on i386.  No objections from my side.

Regards,
Simon

> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/www/fcgi/Makefile,v
> > retrieving revision 1.7
> > diff -u -r1.7 Makefile
> > --- Makefile 14 Jan 2006 11:46:15 -0000 1.7
> > +++ Makefile 6 Nov 2006 01:37:23 -0000
> > @@ -3,7 +3,7 @@
> >  COMMENT= "FastCGI Development Kit"
> >  
> >  DISTNAME= fcgi-2.4.0
> > -PKGNAME= ${DISTNAME}p1
> > +PKGNAME= ${DISTNAME}p2
> >  CATEGORIES= www
> >  SHARED_LIBS= fcgi++ 1.0 \
> >   fcgi 0.0
> > @@ -17,7 +17,7 @@
> >  PERMIT_PACKAGE_FTP=     Yes
> >  PERMIT_DISTFILES_CDROM= Yes
> >  PERMIT_DISTFILES_FTP=   Yes
> > -WANTLIB= c
> > +WANTLIB= c
> >  
> >  MASTER_SITES= ${HOMEPAGE}/dist/
> >  
> > @@ -28,6 +28,12 @@
> >  CAT3_FILES= FCGI_Accept FCGI_Finish FCGI_SetExitStatus \
> >   FCGI_StartFilterData
> >  
> > +post-configure:
> > + @cd ${WRKSRC}/perl && perl Makefile.PL
> > +
> > +post-build:
> > + @cd ${WRKSRC}/perl && make
> > +
> >  post-install:
> >   ${INSTALL_MAN} ${WRKSRC}/doc/cgi-fcgi.1 ${PREFIX}/man/cat1/cgi-fcgi.0
> >  .for file in ${CAT3_FILES}
> > @@ -36,5 +42,6 @@
> >   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fcgi
> >   ${INSTALL_DATA} ${WRKSRC}/doc/*.htm* ${WRKSRC}/doc/*.gif \
> >   ${PREFIX}/share/doc/fcgi
> > + @cd ${WRKSRC}/perl && make install
> >  
> >  .include <bsd.port.mk>
> > Index: pkg/PFRAG.shared
> > ===================================================================
> > RCS file: /cvs/ports/www/fcgi/pkg/PFRAG.shared,v
> > retrieving revision 1.3
> > diff -u -r1.3 PFRAG.shared
> > --- pkg/PFRAG.shared 30 Dec 2005 22:26:50 -0000 1.3
> > +++ pkg/PFRAG.shared 6 Nov 2006 01:37:23 -0000
> > @@ -1,3 +1,4 @@
> >  @comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/30 22:26:50 sturm Exp $
> >  @lib lib/libfcgi++.so.${LIBfcgi++_VERSION}
> >  @lib lib/libfcgi.so.${LIBfcgi_VERSION}
> > +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/FCGI/FCGI.so
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/www/fcgi/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -r1.3 PLIST
> > --- pkg/PLIST 15 Sep 2004 18:49:49 -0000 1.3
> > +++ pkg/PLIST 6 Nov 2006 01:37:23 -0000
> > @@ -11,11 +11,17 @@
> >  lib/libfcgi++.la
> >  lib/libfcgi.a
> >  lib/libfcgi.la
> > +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
> > +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/FCGI.pm
> > +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
> > +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/FCGI/
> > +libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/FCGI/FCGI.bs
> >  @man man/cat1/cgi-fcgi.0
> >  @man man/cat3/FCGI_Accept.0
> >  @man man/cat3/FCGI_Finish.0
> >  @man man/cat3/FCGI_SetExitStatus.0
> >  @man man/cat3/FCGI_StartFilterData.0
> > +@man man/man3p/FCGI.3p
> >  share/doc/fcgi/
> >  share/doc/fcgi/fcgi-devel-kit.htm
> >  share/doc/fcgi/fcgi-java.htm
>

Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

Marc Espie-2
In reply to this post by Adam Montague
On Sun, Nov 05, 2006 at 08:43:13PM -0500, Adam Montague wrote:

> Marc Balmer <[hidden email]> wrote:
>
> > oh, and as we have perl in base, why don't you just enable perl by
> > default instead of creating a FLAVOR?
>
> There is no FLAVOR, the subpackage you mean?  I wasn't sure if it should
> be in a subpackage (and if so, if there should be a no_perl FLAVOR), or
> if it should just be built and installed no matter what.  Here's a patch
> with it just enabled and installed no matter what.
>
Yep, I fully agree with Marc there: there's no need to add tweaks. Perl is
always there, and it takes probably an extra 10 seconds to build it, for 60k
of files.

I'm committing your diff with two tweaks:

- always use ${MAKE} in Makefiles. This macro is special, it's the make
that was invoked in the first place. This ensures that people testing make
patches will keep testing them.

- use shared_libs.log to re-populate shared libs.

Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

ben calvert
In reply to this post by Marc Balmer-2

 

On Sun, 5 Nov 2006 23:43:47 +0100
Marc Balmer <[hidden email]> wrote:

> oh, and as we have perl in base, why don't you just enable perl by
> default instead of creating a FLAVOR?
>

How broadly are you willing to extend this policy?  for example, we have
a -perl flavor for vim, which means I always have to compile from ports
rather than using the package

Ben

Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

Marc Espie-2
On Mon, Nov 06, 2006 at 10:54:58AM -0800, Ben Calvert wrote:

>
>  
>
> On Sun, 5 Nov 2006 23:43:47 +0100
> Marc Balmer <[hidden email]> wrote:
>
> > oh, and as we have perl in base, why don't you just enable perl by
> > default instead of creating a FLAVOR?
> >
>
> How broadly are you willing to extend this policy?  for example, we have
> a -perl flavor for vim, which means I always have to compile from ports
> rather than using the package

This is something different, actually.

The perl vim flavor embeds parts of a perl interpreter into vim, bloating
the editor a great deal.

Whereas fastcgi perl support is just some extra files in the package, with
about no tendrils in fastcgi proper...

Reply | Threaded
Open this post in threaded view
|

Re: adding perl to fastcgi

ben calvert
On Mon, 6 Nov 2006 20:06:49 +0100
Marc Espie <[hidden email]> wrote:

> On Mon, Nov 06, 2006 at 10:54:58AM -0800, Ben Calvert wrote:
> >
> >  
> >
> > On Sun, 5 Nov 2006 23:43:47 +0100
> > Marc Balmer <[hidden email]> wrote:
> >
> > > oh, and as we have perl in base, why don't you just enable perl by
> > > default instead of creating a FLAVOR?
> > >
> >
> > How broadly are you willing to extend this policy?  for example, we
> > have a -perl flavor for vim, which means I always have to compile
> > from ports rather than using the package
>
> This is something different, actually.
>
> The perl vim flavor embeds parts of a perl interpreter into vim,
> bloating the editor a great deal.
>
> Whereas fastcgi perl support is just some extra files in the package,
> with about no tendrils in fastcgi proper...
>

ah.  ok.  nevermind then. I'll just keep compiling it by hand.