kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkglint clean-up

Browse source
This commit is contained in:
adam 2011-07-08 10:20:10 +00:00
parent ac198f041d
commit 647417e5b0
3 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lang/php53/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2011/06/24 11:59:29 taca Exp $
# $NetBSD: Makefile,v 1.14 2011/07/08 10:20:10 adam Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
@ -21,10 +21,10 @@ LIBTOOL_OVERRIDE= # empty
CGIDIR= ${PREFIX}/libexec/cgi-bin
EGDIR= ${PREFIX}/share/examples/php
MESSAGE_SUBST+= CGIDIR=${CGIDIR:Q}
MESSAGE_SUBST+= CGIDIR=${CGIDIR}
CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
MAKE_ENV+= INSTALL_ROOT=${DESTDIR:Q}
MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR}
@ -37,7 +37,7 @@ SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
INSTALLATION_DIRS+= ${CGIDIR}
INSTALLATION_DIRS+= ${CGIDIR} ${EGDIR} share/php
# Make sure modules can link correctly
.if ${OPSYS} == "Darwin"
@ -49,16 +49,12 @@ post-extract:
${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php \
${DESTDIR:Q}${PREFIX:Q}/bin/php
${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/php.1
${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi \
${DESTDIR:Q}${CGIDIR:Q}/php
${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR:Q}
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
${DESTDIR:Q}${EGDIR:Q}
${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/share/php
${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR:Q}${PREFIX:Q}/share/php
${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
.include "../../mk/bsd.pkg.mk"

4
lang/php53/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.5 2011/03/19 07:01:18 taca Exp $
# $NetBSD: Makefile.common,v 1.6 2011/07/08 10:20:10 adam Exp $
# used by lang/php53/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php53-extensions/Makefile
@ -42,7 +42,7 @@ HOMEPAGE?= http://www.php.net/
PHP_BASE_VERS= 5.3.6
PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
PKG_SYSCONFVAR?= php

18
lang/php53/Makefile.php
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.php,v 1.5 2011/02/21 16:23:58 taca Exp $
# $NetBSD: Makefile.php,v 1.6 2011/07/08 10:20:10 adam Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
@ -16,13 +16,13 @@ PLIST_VARS+= suhosin
CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR:Q}/php.d
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --with-regex=system
@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --disable-pdo
CONFIGURE_ARGS+= --disable-json
CONFIGURE_ARGS+= --enable-xml
CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX:Q}
CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
.include "../../textproc/libxml2/buildlink3.mk"
# Note: This expression is the same as ${PKGBASE}, but the latter is
@ -60,19 +60,19 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.if !empty(PKG_OPTIONS:Msuhosin)
SUHOSIN_PHPVER= 5.3.4
. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.3.4" || ${PHP_BASE_VERS} != "5.3.5")
. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && (${SUHOSIN_PHPVER} != "5.3.4" || ${PHP_BASE_VERS} != "5.3.5")
PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
PKG_FAIL_REASON+= "an updated patch is released or temporarily"
PKG_FAIL_REASON+= "build this package without the suhosin option."
. else
. else
PATCH_SITES= http://download.suhosin.org/
PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz
PATCH_DIST_STRIP= -p1
PLIST.suhosin= yes
MESSAGE_SRC= ${.CURDIR}/../../lang/php53/MESSAGE
MESSAGE_SRC+= ${.CURDIR}/../../lang/php53/MESSAGE.suhosin
. endif
. endif
.endif
.if !empty(PKG_OPTIONS:Minet6)