Fix compilation errors if mbregex is selected.

PR:		ports/31666
Submitted by:	sf
This commit is contained in:
Dirk Froemberg 2001-11-05 12:07:16 +00:00
parent 5c980db232
commit 49d97d5a25
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=49595
8 changed files with 12 additions and 154 deletions

View file

@ -20,7 +20,7 @@ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
http://php3.globe.de/${PHP_DISTDIR}/
DISTNAME= php-${PORTVERSION}
PATCHFILES= php_configure.3.diff
PATCHFILES= patch-ext_gd_config.m4 patch-ext_gd_gd.c patch-ext_sybase_ct_config.m4
PATCH_SITES= http://www.physik.tu-berlin.de/~ibex/ports/distfiles/ \
${MASTER_SITE_LOCAL}/dirk/
@ -35,6 +35,7 @@ PHP_DISTDIR= distributions
SLAVEDIRS= lang/php4
USE_AUTOCONF= yes
USE_LIBTOOL= yes
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)

View file

@ -1,3 +1,5 @@
MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
MD5 (php_configure.3.diff) = 7c67a6879505e44b6424ccbcdf7bcefe
MD5 (patch-ext_gd_config.m4) = b4fb911d11e6bb4e8e712407de7600bb
MD5 (patch-ext_gd_gd.c) = f83c2a0433c744c7b7b03fe2533ed7d9
MD5 (patch-ext_sybase_ct_config.m4) = ec731e9b05af2eb3e8ac12a0231d9a8b

View file

@ -1,72 +0,0 @@
--- configure.orig Mon Apr 30 15:47:59 2001
+++ configure Fri May 4 00:14:24 2001
@@ -45273,18 +45273,6 @@
fi
- case "cs" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lcs $LIBS"
-
-
- ;;
- esac
-
-
case "ct" in
c|c_r|pthread*) ;;
*)
@@ -45296,31 +45284,7 @@
;;
esac
-
- case "comn" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lcomn $LIBS"
-
-
- ;;
- esac
-
-
- case "intl" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lintl $LIBS"
-
-
- ;;
- esac
-
- SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
+ SYBASE_CT_LIBS="-lct"
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 @@
else
echo "$ac_t""no" 1>&6
-
- case "sybtcl" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lsybtcl $LIBS"
-
-
- ;;
- esac
fi

View file

@ -240,9 +240,7 @@ POSTEXTRACT+= post-extract-mbregex
post-extract-mbregex:
[ -d \${WRKDIR}/mbregex ] && \\
(cd \${WRKSRC}; \\
\${MV} ${WRKDIR}/mbregex ext; \\
\${RM} configure; \\
./buildconf)
\${MV} ${WRKDIR}/mbregex ext)
EOF
;;

View file

@ -20,7 +20,7 @@ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
http://php3.globe.de/${PHP_DISTDIR}/
DISTNAME= php-${PORTVERSION}
PATCHFILES= php_configure.3.diff
PATCHFILES= patch-ext_gd_config.m4 patch-ext_gd_gd.c patch-ext_sybase_ct_config.m4
PATCH_SITES= http://www.physik.tu-berlin.de/~ibex/ports/distfiles/ \
${MASTER_SITE_LOCAL}/dirk/
@ -35,6 +35,7 @@ PHP_DISTDIR= distributions
SLAVEDIRS= lang/php4
USE_AUTOCONF= yes
USE_LIBTOOL= yes
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)

View file

@ -1,3 +1,5 @@
MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
MD5 (php_configure.3.diff) = 7c67a6879505e44b6424ccbcdf7bcefe
MD5 (patch-ext_gd_config.m4) = b4fb911d11e6bb4e8e712407de7600bb
MD5 (patch-ext_gd_gd.c) = f83c2a0433c744c7b7b03fe2533ed7d9
MD5 (patch-ext_sybase_ct_config.m4) = ec731e9b05af2eb3e8ac12a0231d9a8b

View file

@ -1,72 +0,0 @@
--- configure.orig Mon Apr 30 15:47:59 2001
+++ configure Fri May 4 00:14:24 2001
@@ -45273,18 +45273,6 @@
fi
- case "cs" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lcs $LIBS"
-
-
- ;;
- esac
-
-
case "ct" in
c|c_r|pthread*) ;;
*)
@@ -45296,31 +45284,7 @@
;;
esac
-
- case "comn" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lcomn $LIBS"
-
-
- ;;
- esac
-
-
- case "intl" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lintl $LIBS"
-
-
- ;;
- esac
-
- SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
+ SYBASE_CT_LIBS="-lct"
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 @@
else
echo "$ac_t""no" 1>&6
-
- case "sybtcl" in
- c|c_r|pthread*) ;;
- *)
-
-
- LIBS="-lsybtcl $LIBS"
-
-
- ;;
- esac
fi

View file

@ -240,9 +240,7 @@ POSTEXTRACT+= post-extract-mbregex
post-extract-mbregex:
[ -d \${WRKDIR}/mbregex ] && \\
(cd \${WRKSRC}; \\
\${MV} ${WRKDIR}/mbregex ext; \\
\${RM} configure; \\
./buildconf)
\${MV} ${WRKDIR}/mbregex ext)
EOF
;;