cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix WANTLIB markers and dependencies (from alek@ and wilfried@)

Browse Source 
- delete some whitespaces (from wilfried@)
- don't leave mess in ldconfig search path
(reported by Moritz Grimm <mlist@scapa.dnsalias.net>)
- bump PKGNAMEs

tested by many; ok pval@
This commit is contained in:
robert 2005-03-16 20:09:41 +00:00
parent 22d2e6af33
commit efcd59df1a
5 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/php5/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.2 2004/12/20 20:59:44 robert Exp $ # $OpenBSD: Makefile.inc,v 1.3 2005/03/16 20:09:41 robert Exp $
# This port currently only works with archs supporting dynamic loading # This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's. # and has Apache that supports DSO's.
@ -41,12 +41,11 @@ MODULES_DIR= ${CHROOT_DIR}/${MODULES_SUBDIR}
PHP_LDFLAGS= -lstdc++ -lm PHP_LDFLAGS= -lstdc++ -lm
.endif .endif
LIB_DEPENDS+= xml2.8::textproc/libxml
CONFIGURE_STYLE= autoconf CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.52 AUTOCONF_VERSION= 2.52
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS}" \
EXTENSION_DIR=${MODULES_DIR} EXTENSION_DIR=${MODULES_DIR}
MAKE_ENV= ${CONFIGURE_ENV} MAKE_ENV= ${CONFIGURE_ENV}
CONFIGURE_ARGS+= --enable-shared \ CONFIGURE_ARGS+= --enable-shared \
@ -58,7 +57,7 @@ CONFIGURE_ARGS+= --enable-shared \
# default included extensions # default included extensions
CONFIGURE_ARGS+= --with-openssl \ CONFIGURE_ARGS+= --with-openssl \
--with-zlib --with-zlib
REGRESS_TARGET= test REGRESS_TARGET= test
REGRESS_FLAGS= NO_INTERACTION=1 REGRESS_FLAGS= NO_INTERACTION=1

14
www/php5/core/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2004/12/20 20:59:44 robert Exp $ # $OpenBSD: Makefile,v 1.7 2005/03/16 20:09:41 robert Exp $
MULTI_PACKAGES= -pear MULTI_PACKAGES= -pear
SUBPACKAGE?= SUBPACKAGE?=
COMMENT= "server-side HTML-embedded scripting language" COMMENT= "server-side HTML-embedded scripting language"
COMMENT-pear= "base classes for common PHP tasks" COMMENT-pear= "base classes for common PHP tasks"
PKGNAME= php5-core-${V} PKGNAME= php5-core-${V}p1
FULLPKGNAME-pear= php5-pear-${V} FULLPKGNAME-pear= php5-pear-${V}p1
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--without-mysql \ --without-mysql \
@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
MODULES= devel/gettext MODULES= devel/gettext
# some variables to substitute # some variables to substitute
SUBST_VARS= PHP_CONFIG_FILE SUBST_VARS= PHP_CONFIG_FILE
PHP_VERSION= ${V} PHP_VERSION= ${V}
@ -46,7 +46,11 @@ WANTLIB= c crypto des m ssl stdc++ z
.if defined(PACKAGING) && !empty(SUBPACKAGE) .if defined(PACKAGING) && !empty(SUBPACKAGE)
PREFIX= ${CHROOT_DIR} PREFIX= ${CHROOT_DIR}
RUN_DEPENDS= :php5-core-${V}:www/php5/core RUN_DEPENDS= :php5-core-${V}:www/php5/core
WANTLIB=
MODULES=
.else
LIB_DEPENDS= xml2.8::textproc/libxml
.endif .endif
pre-fake: pre-fake:

43
www/php5/extensions/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2004/12/21 12:15:02 espie Exp $ # $OpenBSD: Makefile,v 1.6 2005/03/16 20:09:41 robert Exp $
FULLPKGNAME= php5-extensions-${V} FULLPKGNAME= php5-extensions-${V}p1
COMMENT= "informational package about PHP5 extensions" COMMENT= "informational package about PHP5 extensions"
MULTI_PACKAGES= MULTI_PACKAGES=
@ -10,12 +10,14 @@ SUBPACKAGE?=
PREFIX?= ${CHROOT_DIR} PREFIX?= ${CHROOT_DIR}
FLAVORS= no_x11 FLAVORS= no_x11
FLAVOR?= FLAVOR?=
WANTLIB= crypto gssapi krb5 m ncurses panel ssl z WANTLIB= stdc++ m
RUN_DEPENDS= :php5-core-${V}:www/php5/core RUN_DEPENDS= :php5-core-${V}:www/php5/core
.if !defined(PACKAGING)
MODULES= devel/gettext MODULES= devel/gettext
.endif
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--with-iconv-dir=${LOCALBASE} \ --with-iconv-dir=${LOCALBASE} \
@ -23,13 +25,11 @@ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--disable-dom --disable-dom
GRAPHIC_DEPENDS= jpeg.62::graphics/jpeg \ GRAPHIC_DEPENDS= jpeg.62::graphics/jpeg \
png.3::graphics/png \ png.3::graphics/png
tiff.35::graphics/tiff
GRAPHIC_CONFIG= --with-jpeg-dir=${LOCALBASE} \ GRAPHIC_CONFIG= --with-jpeg-dir=${LOCALBASE} \
--with-png-dir=${LOCALBASE} \ --with-png-dir=${LOCALBASE} \
--with-tiff-dir=${LOCALBASE} \ --with-zlib-dir=/usr
--with-zlib-dir=/usr
# bz2 # bz2
PSEUDO_FLAVORS+= no_bz2 PSEUDO_FLAVORS+= no_bz2
@ -51,6 +51,7 @@ MULTI_PACKAGES+= -curl
COMMENT-curl= "curl URL library extensions for php5" COMMENT-curl= "curl URL library extensions for php5"
CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE} CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
CURL_DEPENDS= curl.2::net/curl CURL_DEPENDS= curl.2::net/curl
CURL_WANTLIB= crypto ssl z
.endif .endif
# dba # dba
@ -81,7 +82,7 @@ CONFIGURE_ARGS+= --disable-dbx
.else .else
MULTI_PACKAGES+= -dbx MULTI_PACKAGES+= -dbx
COMMENT-dbx= "dbx database abstraction interface for php5" COMMENT-dbx= "dbx database abstraction interface for php5"
CONFIGURE_ARGS+= --enable-dbx=shared CONFIGURE_ARGS+= --enable-dbx=shared
.endif .endif
# filepro # filepro
@ -104,17 +105,20 @@ MULTI_PACKAGES+= -gd
COMMENT-gd= "image manipulation extensions for php5" COMMENT-gd= "image manipulation extensions for php5"
GD_DEPENDS= ttf.1::print/freetype ${GRAPHIC_DEPENDS} \ GD_DEPENDS= ttf.1::print/freetype ${GRAPHIC_DEPENDS} \
t1.5::devel/t1lib t1.5::devel/t1lib
GD_WANTLIB= z
CONFIGURE_ARGS+= --with-gd=shared ${GRAPHIC_CONFIG} \ CONFIGURE_ARGS+= --with-gd=shared ${GRAPHIC_CONFIG} \
--with-ttf=shared,${LOCALBASE} --without-freetype-dir \ --with-ttf=shared,${LOCALBASE} --without-freetype-dir \
--with-t1lib=${LOCALBASE} --with-t1lib=${LOCALBASE}
.if !${FLAVOR:L:Mno_x11} . if !${FLAVOR:L:Mno_x11}
USE_X11= yes USE_X11= yes
CONFIGURE_ARGS+= --with-xpm-dir=${X11BASE} CONFIGURE_ARGS+= --with-xpm-dir=${X11BASE}
WANTLIB+= X11 Xpm . if !defined(PACKAGING) || ${SUBPACKAGE} == "-gd"
.else GD_WANTLIB+= X11 Xpm
. endif
. else
CONFIGURE_ARGS+= --without-xpm-dir CONFIGURE_ARGS+= --without-xpm-dir
FULLPKGNAME-gd= php5-gd-${V}-no_x11 FULLPKGNAME-gd= php5-gd-${V}-no_x11
.endif . endif
.endif .endif
# gmp # gmp
@ -138,6 +142,7 @@ COMMENT-imap= "imap, pop3 and nntp extensions for php5"
CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \ CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
--with-kerberos=/usr --with-imap-ssl --with-kerberos=/usr --with-imap-ssl
IMAP_DEPENDS= c-client.3::mail/c-client IMAP_DEPENDS= c-client.3::mail/c-client
IMAP_WANTLIB= gssapi crypto krb5 ssl
.endif .endif
# ldap # ldap
@ -192,6 +197,7 @@ CONFIGURE_ARGS+= --without-ncurses
MULTI_PACKAGES+= -ncurses MULTI_PACKAGES+= -ncurses
COMMENT-ncurses= "ncurses extensions for php5" COMMENT-ncurses= "ncurses extensions for php5"
CONFIGURE_ARGS+= --with-ncurses=shared,${LOCALBASE} CONFIGURE_ARGS+= --with-ncurses=shared,${LOCALBASE}
NCURSES_WANTLIB= ncurses panel
.endif .endif
# odbc # odbc
@ -226,7 +232,7 @@ COMMENT-shmop= "shared memory extensions for php5"
CONFIGURE_ARGS+= --enable-shmop=shared CONFIGURE_ARGS+= --enable-shmop=shared
.endif .endif
# snmp # snmp
PSEUDO_FLAVORS+= no_snmp PSEUDO_FLAVORS+= no_snmp
.if ${FLAVOR:L:Mno_snmp} .if ${FLAVOR:L:Mno_snmp}
CONFIGURE_ARGS+= --without-snmp CONFIGURE_ARGS+= --without-snmp
@ -235,6 +241,7 @@ MULTI_PACKAGES+= -snmp
COMMENT-snmp= "snmp protocol extensions for php5" COMMENT-snmp= "snmp protocol extensions for php5"
CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
SNMP_DEPENDS= netsnmp.6.2::net/net-snmp SNMP_DEPENDS= netsnmp.6.2::net/net-snmp
SNMP_WANTLIB= crypto
.endif .endif
# sqlite # sqlite
@ -256,7 +263,7 @@ CONFIGURE_ARGS+= --without-sybase-ct
MULTI_PACKAGES+= -sybase_ct MULTI_PACKAGES+= -sybase_ct
COMMENT-sybase_ct= "sybase database access extensions for php5" COMMENT-sybase_ct= "sybase database access extensions for php5"
CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE} CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
SYBASE_CT_DEPENDS= tds.0,ct.0::databases/freetds SYBASE_CT_DEPENDS= ct.0::databases/freetds
.endif .endif
# xml-rpc # xml-rpc
@ -268,26 +275,30 @@ MULTI_PACKAGES+= -xmlrpc
COMMENT-xmlrpc= "XML RPC functions for php5" COMMENT-xmlrpc= "XML RPC functions for php5"
CONFIGURE_ARGS+= --with-xmlrpc=shared CONFIGURE_ARGS+= --with-xmlrpc=shared
XMLRPC_DEPENDS= expat.2::textproc/expat XMLRPC_DEPENDS= expat.2::textproc/expat
XMLRPC_WANTLIB= iconv
.endif .endif
.for i in ${MULTI_PACKAGES} .for i in ${MULTI_PACKAGES}
.if !defined(FULLPKGNAME${i}) .if !defined(FULLPKGNAME${i})
FULLPKGNAME${i}= php5${i}-${V}p0 FULLPKGNAME${i}= php5${i}-${V}p1
.endif .endif
.endfor .endfor
.if defined(PACKAGING) && !empty(SUBPACKAGE) .if defined(PACKAGING) && !empty(SUBPACKAGE)
MODULE_NAME= ${SUBPACKAGE:S/-//g} MODULE_NAME= ${SUBPACKAGE:S/-//g}
LIB_DEPENDS= ${${MODULE_NAME:U}_DEPENDS} LIB_DEPENDS= ${${MODULE_NAME:U}_DEPENDS}
WANTLIB+= ${${MODULE_NAME:U}_WANTLIB}
MESSAGE= ${PKGDIR}/MESSAGE MESSAGE= ${PKGDIR}/MESSAGE
SUBST_VARS= MODULE_NAME PHP_CONFIG_FILE LOCALBASE SUBST_VARS= MODULE_NAME PHP_CONFIG_FILE LOCALBASE
.elif defined(PACKAGING) && empty(SUBPACKAGE) .elif defined(PACKAGING) && empty(SUBPACKAGE)
LIB_DEPENDS= LIB_DEPENDS=
MESSAGE= ${PKGDIR}/DESCR MESSAGE= ${PKGDIR}/DESCR
SUBST_VARS= V SUBST_VARS= V
WANTLIB=
.else .else
.for i in ${MULTI_PACKAGES} .for i in ${MULTI_PACKAGES}
LIB_DEPENDS+= ${${i:U:S/-//g}_DEPENDS} LIB_DEPENDS+= ${${i:U:S/-//g}_DEPENDS}
WANTLIB+= ${${i:U:S/-//g}_WANTLIB}
.endfor .endfor
.endif .endif

3
www/php5/extensions/pkg/DESCR
View File

@ -3,9 +3,8 @@ now split into small sub-packages, designed to allow you to install
modules independently of the main PHP engine. modules independently of the main PHP engine.
For example, to install the IMAP module, just pkg_add the For example, to install the IMAP module, just pkg_add the
php-imap-${V}.tgz package and activate it using the php5-imap-${V}p1.tgz package and activate it using the
'phpxs' command. 'phpxs' command.
This package contains no files or dependencies and may be This package contains no files or dependencies and may be
safely uninstalled. safely uninstalled.

17
www/php5/patches/patch-aclocal_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-aclocal_m4,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $ $OpenBSD: patch-aclocal_m4,v 1.2 2005/03/16 20:09:41 robert Exp $
--- aclocal.m4.orig Mon Jul 26 23:06:19 2004 --- aclocal.m4.orig Wed Dec 15 07:58:45 2004
+++ aclocal.m4 Mon Jul 26 23:06:53 2004 +++ aclocal.m4 Mon Mar 14 23:32:17 2005
@@ -1655,6 +1655,7 @@ @@ -1655,6 +1655,7 @@
PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
@ -9,7 +9,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $
],[ ],[
AC_MSG_ERROR([libcrypto not found!]) AC_MSG_ERROR([libcrypto not found!])
],[ ],[
@@ -3934,7 +3935,7 @@ @@ -3946,7 +3947,7 @@
need_version=no need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
@ -18,3 +18,12 @@ $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
@@ -4156,7 +4157,7 @@
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ finish_cmds=
shlibpath_var=LD_LIBRARY_PATH
;;