From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 21 22:00:35 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 835FB16A426 for ; Tue, 21 Mar 2006 22:00:35 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5FCD43D45 for ; Tue, 21 Mar 2006 22:00:33 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2LM0Xr5037727 for ; Tue, 21 Mar 2006 22:00:33 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2LM0X0Z037719; Tue, 21 Mar 2006 22:00:33 GMT (envelope-from gnats) Resent-Date: Tue, 21 Mar 2006 22:00:33 GMT Resent-Message-Id: <200603212200.k2LM0X0Z037719@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Linh Pham Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5100C16A46C; Tue, 21 Mar 2006 21:56:19 +0000 (UTC) (envelope-from question@closedsrc.org) Received: from q.closedsrc.org (q.closedsrc.org [72.1.133.20]) by mx1.FreeBSD.org (Postfix) with ESMTP id DECB843D46; Tue, 21 Mar 2006 21:56:18 +0000 (GMT) (envelope-from question@closedsrc.org) Received: by q.closedsrc.org (Postfix, from userid 1001) id 75CCD45026; Tue, 21 Mar 2006 13:56:18 -0800 (PST) Message-Id: <20060321215618.75CCD45026@q.closedsrc.org> Date: Tue, 21 Mar 2006 13:56:18 -0800 (PST) From: Linh Pham To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: sergei@FreeBSD.org Subject: ports/94812: Update port: security/base to 1.2.4 and add hooks for MySQL/PGSQL X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Linh Pham List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 22:00:35 -0000 >Number: 94812 >Category: ports >Synopsis: Update port: security/base to 1.2.4 and add hooks for MySQL/PGSQL >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 21 22:00:33 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Linh Pham >Release: FreeBSD 6.0-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD q.internal.closedsrc.org 6.0-RELEASE-p3 FreeBSD 6.0-RELEASE-p3 #7: Thu Jan 19 21:46:45 PST 2006 question@q.internal.closedsrc.org:/usr/obj/usr/src/sys/Q i386 >Description: Update security/base to 1.2.4; this PR supercedes ports/94085. BASE 1.2.4 includes many, many bugfixes and changes which PDF library it uses. I added hooks to the Makefile to allow the user to choose which database to use, as well as the option to include support for PDF via print/fpdf. Updated ./files/pkg-message.in to include mention of FPDF path, since it does not use the standard PHP sub-ports or standard PHP class paths. Any feedback on how I implemented how the the hooks are handled would be appreciated. >How-To-Repeat: >Fix: --- base-1.2.4.diff begins here --- diff -ruN /usr/ports/security/base/Makefile base/Makefile --- /usr/ports/security/base/Makefile Tue Jan 17 18:42:15 2006 +++ base/Makefile Tue Mar 21 13:48:37 2006 @@ -6,7 +6,7 @@ # PORTNAME= base -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= secureideas @@ -18,13 +18,49 @@ ${ADODB_DIR}/adodb.inc.php:${PORTSDIR}/databases/adodb \ ${LOCALBASE}/share/pear/Image/Graph.php:${PORTSDIR}/graphics/pear-Image_Graph -USE_PHP= yes -USE_REINPLACE= yes +USE_PHP= session gettext +WANT_PHP_PEAR= yes ADODB_DIR= ${LOCALBASE}/share/adodb SUB_FILES= pkg-message DOCS= docs/CHANGELOG docs/CREDITS docs/README docs/TODO docs/UPGRADE + +.if defined(WITH_MYSQL) +USE_PHP+= mysql +.endif + +.if defined(WITH_PGSQL) +USE_PHP+= pgsql +.endif + +.if defined(WITH_PDF) +USE_PHP+= zlib +RUN_DEPENDS+= ${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf +.endif + +pre-patch: +.if !defined(WITH_MYSQL) + @${ECHO_MSG} "" + @${ECHO_MSG} " *********************************************" + @${ECHO_MSG} " To enable support for MySQL databases," + @${ECHO_MSG} " build this port with WITH_MYSQL=YES" + @${ECHO_MSG} " *********************************************" +.endif +.if !defined(WITH_PGSQL) + @${ECHO_MSG} "" + @${ECHO_MSG} " *********************************************" + @${ECHO_MSG} " To enable support for PostgreSQL databases," + @${ECHO_MSG} " build this port with WITH_PGSQL=YES" + @${ECHO_MSG} " *********************************************" +.endif +.if !defined(WITH_PDF) + @${ECHO_MSG} "" + @${ECHO_MSG} " *********************************************" + @${ECHO_MSG} " To enable support for PDF support," + @${ECHO_MSG} " build this port with WITH_PDF=YES" + @${ECHO_MSG} " *********************************************" +.endif do-build: @${REINPLACE_CMD} -e 's,DBlib_path = "",DBlib_path = "${ADODB_DIR}",' \ diff -ruN /usr/ports/security/base/distinfo base/distinfo --- /usr/ports/security/base/distinfo Tue Jan 17 18:42:15 2006 +++ base/distinfo Tue Mar 21 13:19:10 2006 @@ -1,3 +1,3 @@ -MD5 (base-1.2.2.tar.gz) = b257240c6e554f0e3a78913ecd01baa3 -SHA256 (base-1.2.2.tar.gz) = 63054beb2d615934ad492b239a89536e97c7fd89c4faeb67107d2b3929d80e53 -SIZE (base-1.2.2.tar.gz) = 346518 +MD5 (base-1.2.4.tar.gz) = 7f67a39b4213bdc6bce71a90444a9c58 +SHA256 (base-1.2.4.tar.gz) = a9f578a421d687d66f150e1e32f37e6641fe1ad36b2837e8d2476481143f28c1 +SIZE (base-1.2.4.tar.gz) = 327770 diff -ruN /usr/ports/security/base/files/pkg-message.in base/files/pkg-message.in --- /usr/ports/security/base/files/pkg-message.in Sat Jul 2 19:46:28 2005 +++ base/files/pkg-message.in Tue Mar 21 13:40:38 2006 @@ -18,4 +18,9 @@ include_path = ".:%%PREFIX%%/share/pear" +If you built BASE with PDF support, make sure you include the FPDF +path in your %%LOCALBASE%%/etc/php.ini configuration file, like: + + include_path = ".:%%PREFIX%%/share/pear:%%PREFIX%%/share/fpdf" + ======================================================================== diff -ruN /usr/ports/security/base/pkg-plist base/pkg-plist --- /usr/ports/security/base/pkg-plist Tue Jan 24 10:04:44 2006 +++ base/pkg-plist Tue Mar 21 13:44:43 2006 @@ -69,8 +69,8 @@ www/base/includes/base_state_query.inc.php www/base/includes/base_template.php www/base/includes/base_user.inc.php -www/base/includes/class.ezpdf.php -www/base/includes/class.pdf.php +www/base/includes/fpdf_class.php +www/base/includes/fpdf_fonts.php www/base/index.php www/base/languages/czech.lang.php www/base/languages/chinese.lang.php --- base-1.2.4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: