Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Oct 2001 00:31:41 +0200 (CEST)
From:      Thierry Thomas <thierry@thomas.as>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        dirk@freebsd.org
Subject:   ports/31417: Port www/mod_php4: add support of MCAL
Message-ID:  <20011021223141.388747515@graf.pompo.net>

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

>Number:         31417
>Category:       ports
>Synopsis:       Port www/mod_php4: add support of MCAL
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 21 15:40:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Sep 22 10:41:40 CEST 2001 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386


	
>Description:
	Mcal stands for Modular Calendar Access Library.
	I am preparing the port of the next release of the Horde framework, and I need it
	(mcal may be used as a backend for authenticating users, and is used by Kronolith).
>How-To-Repeat:
	Apply the following patch.
	N.B.: the PR ports/31416 should be committed.
>Fix:

diff -ru www/mod_php4.orig/Makefile www/mod_php4/Makefile
--- www/mod_php4.orig/Makefile	Sun Aug 26 14:21:31 2001
+++ www/mod_php4/Makefile	Sun Oct 21 19:16:32 2001
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mod_php4
 PORTVERSION=	4.0.6
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
diff -ru www/mod_php4.orig/files/patch-aq www/mod_php4/files/patch-aq
--- www/mod_php4.orig/files/patch-aq	Fri May  4 00:16:50 2001
+++ www/mod_php4/files/patch-aq	Sun Oct 21 22:55:38 2001
@@ -1,6 +1,45 @@
---- configure.orig	Mon Apr 30 15:47:59 2001
-+++ configure	Fri May  4 00:14:24 2001
-@@ -45273,18 +45273,6 @@
+--- configure.orig	Sat Jul 21 08:28:57 2001
++++ configure	Sun Oct 21 22:54:39 2001
+@@ -26933,6 +26933,29 @@
+ if test "${with_mcal+set}" = set; then
+   withval="$with_mcal"
+   PHP_MCAL=$withval
++  cat >> confdefs.h <<\EOF
++/* Interfaces to callbacks in libmcal */
++#include "/usr/local/include/mcal/mcal.h"
++void cc_searched (unsigned long cal_uid)
++{
++}
++
++void cc_fetched(const CALEVENT *event)
++{
++}
++
++void cc_login(const char **user, const char **pwd)
++{
++}
++
++void cc_vlog(const char *fmt,va_list ap)
++{
++}
++
++void cc_vdlog(const char *fmt,va_list ap)
++{
++}
++EOF
+ else
+   PHP_MCAL=no
+ fi
+@@ -27176,7 +27199,7 @@
+ LTLIBRARY_SHARED_OBJECTS = \$(LTLIBRARY_OBJECTS:.lo=.slo)
+ EOF
+ 
+-  if test "" = "shared" || test "" = "yes"; then
++  if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
+     lib_build_shared=yes
+     if test -n ""; then
+       
+@@ -49386,18 +49409,6 @@
    fi
  
  	
@@ -19,7 +58,7 @@
   case "ct" in
   c|c_r|pthread*) ;;
   *)
-@@ -45296,31 +45284,7 @@
+@@ -49409,31 +49420,7 @@
    ;;
    esac
  
@@ -52,7 +91,7 @@
      old_LDFLAGS=$LDFLAGS
      LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
      echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
-@@ -45372,17 +45336,6 @@
+@@ -49485,17 +49472,6 @@
   
  else
    echo "$ac_t""no" 1>&6
diff -ru www/mod_php4.orig/scripts/configure.php www/mod_php4/scripts/configure.php
--- www/mod_php4.orig/scripts/configure.php	Sat Sep 29 18:40:27 2001
+++ www/mod_php4/scripts/configure.php	Sun Oct 21 19:17:04 2001
@@ -46,6 +46,7 @@
 sysvsem		"System V semaphore support" OFF \
 sysvshm		"System V shared memory support" OFF \
 transsid	"Transparent session id" OFF \
+MCAL		"Modular Calendar Access Library support" OFF \
 2> $tempfile
 
 	retval=$?
@@ -228,6 +229,10 @@
 			echo "LIB_DEPENDS+=	pspell.4:\${PORTSDIR}/textproc/pspell"
 			echo "CONFIGURE_ARGS+=--with-pspell=\${PREFIX}"
 			;;
+		\"MCAL\")
+			echo "CONFIGURE_ARGS+=--with-mcal=\${PREFIX}"
+			echo "LIB_DEPENDS+=	mcal.0:\${PORTSDIR}/misc/libmcal"
+                        ;;
 		\"mbregex\")
 			${CAT} << EOF
 MASTER_SITES+=	ftp://night.fminn.nagano.nagano.jp/php4/
>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?20011021223141.388747515>