[45644] trunk/dports/www/fcgi

blb at macports.org blb at macports.org
Mon Jan 19 00:17:59 PST 2009


Revision: 45644
          http://trac.macports.org/changeset/45644
Author:   blb at macports.org
Date:     2009-01-19 00:17:48 -0800 (Mon, 19 Jan 2009)
Log Message:
-----------
www/fcgi - autoreconf to build universal; better use xinstall, and switch
to copy/delete instead of system "cp"/"rm"

Modified Paths:
--------------
    trunk/dports/www/fcgi/Portfile

Added Paths:
-----------
    trunk/dports/www/fcgi/files/patch-acinclude.m4.diff
    trunk/dports/www/fcgi/files/patch-configure.in.diff
    trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.am.diff

Removed Paths:
-------------
    trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.in
    trunk/dports/www/fcgi/files/patch-ltmain.sh

Modified: trunk/dports/www/fcgi/Portfile
===================================================================
--- trunk/dports/www/fcgi/Portfile	2009-01-19 08:03:50 UTC (rev 45643)
+++ trunk/dports/www/fcgi/Portfile	2009-01-19 08:17:48 UTC (rev 45644)
@@ -5,7 +5,7 @@
 
 name                fcgi
 version             2.4.0
-revision            1
+revision            2
 categories          www
 maintainers         nomaintainer
 description         The FastCGI development kit in C
@@ -19,21 +19,25 @@
 checksums           md5 d15060a813b91383a9f3c66faf84867e
 platforms           darwin
 
-patchfiles          patch-ltmain.sh \
-                    patch-libfcgi-Makefile.in
+depends_build       port:libtool
 
+patchfiles          patch-acinclude.m4.diff patch-configure.in.diff \
+                    patch-libfcgi-Makefile.am.diff
+
+use_autoconf        yes
+autoconf.cmd        autoreconf
+autoconf.args       -fvi
+
 configure.cflags-append   "-Wno-long-double"
 
 post-destroot {
-   xinstall -d -m 755 ${destroot}${prefix}/share/man/man1
-   xinstall -m 644 ${worksrcpath}/doc/cgi-fcgi.1 ${destroot}${prefix}/share/man/man1
-   xinstall -d -m 755 ${destroot}${prefix}/share/man/man3
-   xinstall -m 644 ${worksrcpath}/doc/FCGI_Accept.3 ${destroot}${prefix}/share/man/man3
-   xinstall -m 644 ${worksrcpath}/doc/FCGI_Finish.3 ${destroot}${prefix}/share/man/man3
-   xinstall -m 644 ${worksrcpath}/doc/FCGI_SetExitStatus.3 ${destroot}${prefix}/share/man/man3
-   xinstall -m 644 ${worksrcpath}/doc/FCGI_StartFilterData.3 ${destroot}${prefix}/share/man/man3
+   xinstall -m 644 -W ${worksrcpath}/doc cgi-fcgi.1 \
+      ${destroot}${prefix}/share/man/man1
+   xinstall -m 644 -W ${worksrcpath}/doc FCGI_Accept.3 FCGI_Finish.3 \
+      FCGI_SetExitStatus.3 FCGI_StartFilterData.3 \
+      ${destroot}${prefix}/share/man/man3
    xinstall -d -m 0755 ${destroot}${prefix}/share/doc
-   system "cp -R ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}"
-   system "rm -f ${destroot}${prefix}/share/doc/${name}/*.\[13\]"
+   copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
+   eval delete [glob ${destroot}${prefix}/share/doc/${name}/*.\[13\]]
 }
 

Added: trunk/dports/www/fcgi/files/patch-acinclude.m4.diff
===================================================================
--- trunk/dports/www/fcgi/files/patch-acinclude.m4.diff	                        (rev 0)
+++ trunk/dports/www/fcgi/files/patch-acinclude.m4.diff	2009-01-19 08:17:48 UTC (rev 45644)
@@ -0,0 +1,10 @@
+--- acinclude.m4.orig	2001-12-20 20:12:50.000000000 -0700
++++ acinclude.m4	2009-01-18 23:50:28.000000000 -0700
+@@ -1,6 +1,6 @@
+ dnl     $Id: acinclude.m4,v 1.2 2001/12/21 03:12:50 robs Exp $
+ 
+-AC_DEFUN(FCGI_COMMON_CHECKS, [
++AC_DEFUN([FCGI_COMMON_CHECKS], [
+     AC_CHECK_TYPE([ssize_t], [int]) 
+ 
+     AC_MSG_CHECKING([for sun_len in sys/un.h])

Added: trunk/dports/www/fcgi/files/patch-configure.in.diff
===================================================================
--- trunk/dports/www/fcgi/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/www/fcgi/files/patch-configure.in.diff	2009-01-19 08:17:48 UTC (rev 45644)
@@ -0,0 +1,13 @@
+--- configure.in.orig	2003-01-19 10:19:41.000000000 -0700
++++ configure.in	2009-01-18 23:50:12.000000000 -0700
+@@ -4,8 +4,8 @@
+ dnl     generate the file "configure", which is run during the build
+ dnl     to configure the system for the local environment.
+ 
+-AC_INIT
+-AM_INIT_AUTOMAKE(fcgi, 2.4.0)
++AC_INIT([fcgi],[2.4.0])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ 
+ AM_CONFIG_HEADER(fcgi_config.h)
+ 

Added: trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.am.diff
===================================================================
--- trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.am.diff	2009-01-19 08:17:48 UTC (rev 45644)
@@ -0,0 +1,15 @@
+--- libfcgi/Makefile.am.orig	2001-12-21 20:16:20.000000000 -0700
++++ libfcgi/Makefile.am	2009-01-18 23:57:40.000000000 -0700
+@@ -18,10 +18,11 @@
+                      os_ at SYSTEM@.c
+ libfcgi_la_CC      = @PTHREAD_CC@
+ libfcgi_la_CFLAGS  = @PTHREAD_CFLAGS@
++libfcgi_la_LDFLAGS = -version-number $(subst .,:, at VERSION@)
+ 
+ libfcgi___la_SOURCES = $(INCLUDE_FILES)       \
+                        $(INCLUDEDIR)/fcgio.h  \
+                        fcgio.cpp
+ libfcgi___la_CFLAGS  = @PTHREAD_CFLAGS@
+-libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@
++libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ -version-number $(subst .,:, at VERSION@)
+ 

Deleted: trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.in
===================================================================
--- trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.in	2009-01-19 08:03:50 UTC (rev 45643)
+++ trunk/dports/www/fcgi/files/patch-libfcgi-Makefile.in	2009-01-19 08:17:48 UTC (rev 45644)
@@ -1,16 +0,0 @@
---- ../fcgi-2.4.0.orig/libfcgi/Makefile.in	Sun Jan 19 09:21:18 2003
-+++ libfcgi/Makefile.in	Mon Apr 12 14:46:37 2004
-@@ -122,11 +122,11 @@
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--libfcgi___la_LIBADD =
-+libfcgi___la_LIBADD = -version-number $(subst .,:, at VERSION@)
- am_libfcgi___la_OBJECTS = fcgio.lo
- libfcgi___la_OBJECTS = $(am_libfcgi___la_OBJECTS)
- libfcgi_la_LDFLAGS =
--libfcgi_la_LIBADD =
-+libfcgi_la_LIBADD = -version-number $(subst .,:, at VERSION@)
- am_libfcgi_la_OBJECTS = libfcgi_la-fcgiapp.lo libfcgi_la-fcgi_stdio.lo \
- 	libfcgi_la-os_ at SYSTEM@.lo
- libfcgi_la_OBJECTS = $(am_libfcgi_la_OBJECTS)

Deleted: trunk/dports/www/fcgi/files/patch-ltmain.sh
===================================================================
--- trunk/dports/www/fcgi/files/patch-ltmain.sh	2009-01-19 08:03:50 UTC (rev 45643)
+++ trunk/dports/www/fcgi/files/patch-ltmain.sh	2009-01-19 08:17:48 UTC (rev 45644)
@@ -1,81 +0,0 @@
---- ../fcgi-2.4.0.orig/ltmain.sh	Fri Sep 21 09:49:36 2001
-+++ ltmain.sh	Mon Apr 12 14:43:59 2004
-@@ -770,6 +770,7 @@
-     temp_rpath=
-     thread_safe=no
-     vinfo=
-+    vinfo_number=no
- 
-     # We need to know -static, to get the right output filenames.
-     for arg
-@@ -1118,6 +1119,11 @@
- 	prev=vinfo
- 	continue
- 	;;
-+      -version-number)
-+	prev=vinfo
-+	vinfo_number=yes
-+	continue
-+	;;
- 
-       -Wc,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-@@ -1716,7 +1722,7 @@
- 
- 	  if test "$installed" = no; then
- 	    notinst_deplibs="$notinst_deplibs $lib"
--	    need_relink=yes
-+	    need_relink=no
- 	  fi
- 
- 	  if test -n "$old_archive_from_expsyms_cmds"; then
-@@ -2185,9 +2191,46 @@
- 	  exit 1
- 	fi
- 
--	current="$2"
--	revision="$3"
--	age="$4"
-+	# convert absolute version numbers to libtool ages
-+	# this retains compatibility with .la files and attempts
-+	# to make the code below a bit more comprehensible
-+	
-+	case $vinfo_number in
-+	yes)
-+	  number_major="$2"
-+	  number_minor="$3"
-+	  number_revision="$4"
-+	  #
-+	  # There are really only two kinds -- those that
-+	  # use the current revision as the major version
-+	  # and those that subtract age and use age as
-+	  # a minor version.  But, then there is irix
-+	  # which has an extra 1 added just for fun
-+	  #
-+	  case $version_type in
-+	  darwin|linux|osf|windows)
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
-+	    ;;
-+	  freebsd-aout|freebsd-elf|sunos)
-+	    current="$number_major"
-+	    revision="$number_minor"
-+	    age="0"
-+	    ;;
-+	  irix|nonstopux)
-+	    current=`expr $number_major + $number_minor - 1`
-+	    age="$number_minor"
-+	    revision="$number_minor"
-+	    ;;
-+	  esac
-+	  ;;
-+	no)
-+	  current="$2"
-+	  revision="$3"
-+	  age="$4"
-+	  ;;
-+	esac
- 
- 	# Check that each of the things are valid numbers.
- 	case $current in
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090119/33f8cfb1/attachment.html>


More information about the macports-changes mailing list