Attachment 83999 Details for Bug 119926 – file.diff

[patch] file.diff

file.diff (text/plain), 12.39 KB, created by Vlad V. Teterya on 2008-01-23 18:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vlad V. Teterya

Created: 2008-01-23 18:20:01 UTC

Size: 12.39 KB

patch

obsolete

>diff -ruN oscommerce.old/Makefile oscommerce/Makefile
>--- oscommerce.old/Makefile	Wed Jan 23 18:58:45 2008
>+++ oscommerce/Makefile	Wed Jan 23 19:07:56 2008
>@@ -4,12 +4,12 @@
> # Date Created:	Dec  5 2003
> # Whom:		Travis Campbell <hcoyote@ghostar.org>
> #
>-# $FreeBSD: ports/www/oscommerce/Makefile,v 1.10 2007/07/29 01:19:13 pav Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	oscommerce
>-DISTVERSION=	2.2rc1
>-PORTEPOCH=	2
>+DISTVERSION=	2.2rc2
>+PORTEPOCH=	3
> CATEGORIES=	www
> MASTER_SITES=	http://oscommerce.sunsite.dk/downloads/
> DISTNAME=	${PORTNAME}-${DISTVERSION}
>@@ -18,11 +18,12 @@
> COMMENT=	An full-featured open source e-commerce system
> 
> USE_ZIP=	yes
>-USE_PHP=	mysql session pcre
>+USE_PHP=	mysql session pcre gd curl openssl
> WANT_PHP_WEB=	yes
> NO_BUILD=	yes
> SUB_FILES=	pkg-message
>-DOCS=		CHANGELOG LICENSE STANDARD documentation.pdf upgrade.html
>+DOCS=		CHANGELOG LICENSE STANDARD community_docs.pdf \
>+			documentation.pdf upgrade.html
> 
> do-install:
> 	${MKDIR} ${WWWDIR}
>diff -ruN oscommerce.old/distinfo oscommerce/distinfo
>--- oscommerce.old/distinfo	Wed Jan 23 18:58:45 2008
>+++ oscommerce/distinfo	Wed Jan 23 19:00:04 2008
>@@ -1,3 +1,3 @@
>-MD5 (oscommerce-2.2rc1.zip) = 111310fc0ccefc8ac8b12300e93e6dba
>-SHA256 (oscommerce-2.2rc1.zip) = 117a0681aaa56fbcf904ba97fd4d1df2725c30c8270438d7bfda12e6bdcc6bff
>-SIZE (oscommerce-2.2rc1.zip) = 1975603
>+MD5 (oscommerce-2.2rc2.zip) = 61d099d77f883d7b0aa3030e5bc01a2c
>+SHA256 (oscommerce-2.2rc2.zip) = a0a77652a32cf737750ed74861123b76ebe0d9f3e99d329a0d0c1982e2721f45
>+SIZE (oscommerce-2.2rc2.zip) = 2355801
>diff -ruN oscommerce.old/pkg-plist oscommerce/pkg-plist
>--- oscommerce.old/pkg-plist	Wed Jan 23 18:58:45 2008
>+++ oscommerce/pkg-plist	Wed Jan 23 19:54:27 2008
>@@ -1,6 +1,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/STANDARD
>+%%PORTDOCS%%%%DOCSDIR%%/community_docs.pdf
> %%PORTDOCS%%%%DOCSDIR%%/documentation.pdf
> %%PORTDOCS%%%%DOCSDIR%%/upgrade.html
> %%WWWDIR%%/catalog/.htaccess
>@@ -16,6 +17,7 @@
> %%WWWDIR%%/catalog/admin/.htaccess
> %%WWWDIR%%/catalog/admin/administrators.php
> %%WWWDIR%%/catalog/admin/backup.php
>+%%WWWDIR%%/catalog/admin/backups/.htaccess
> %%WWWDIR%%/catalog/admin/banner_manager.php
> %%WWWDIR%%/catalog/admin/banner_statistics.php
> %%WWWDIR%%/catalog/admin/cache.php
>@@ -45,7 +47,6 @@
> %%WWWDIR%%/catalog/admin/images/categories/tools.gif
> %%WWWDIR%%/catalog/admin/images/graph_hbar_blue.gif
> %%WWWDIR%%/catalog/admin/images/graph_hbar_red.gif
>-%%WWWDIR%%/catalog/admin/images/graphs/.cvsignore
> %%WWWDIR%%/catalog/admin/images/graphs/dummy
> %%WWWDIR%%/catalog/admin/images/header_administration.gif
> %%WWWDIR%%/catalog/admin/images/header_checkout.gif
>@@ -78,6 +79,7 @@
> %%WWWDIR%%/catalog/admin/images/oscommerce.png
> %%WWWDIR%%/catalog/admin/images/pixel_black.gif
> %%WWWDIR%%/catalog/admin/images/pixel_trans.gif
>+%%WWWDIR%%/catalog/admin/includes/.htaccess
> %%WWWDIR%%/catalog/admin/includes/application_bottom.php
> %%WWWDIR%%/catalog/admin/includes/application_top.php
> %%WWWDIR%%/catalog/admin/includes/boxes/catalog.php
>@@ -400,7 +402,6 @@
> %%WWWDIR%%/catalog/admin/includes/languages/german/tax_rates.php
> %%WWWDIR%%/catalog/admin/includes/languages/german/whos_online.php
> %%WWWDIR%%/catalog/admin/includes/languages/german/zones.php
>-%%WWWDIR%%/catalog/admin/includes/local/.cvsignore
> %%WWWDIR%%/catalog/admin/includes/local/README
> %%WWWDIR%%/catalog/admin/includes/modules/index/customers.php
> %%WWWDIR%%/catalog/admin/includes/modules/index/orders.php
>@@ -450,7 +451,12 @@
> %%WWWDIR%%/catalog/download/.htaccess
> %%WWWDIR%%/catalog/download/unreal.zip
> %%WWWDIR%%/catalog/ext/modules/payment/chronopay/callback.php
>-%%WWWDIR%%/catalog/ext/modules/payment/paypal/ipn.php
>+%%WWWDIR%%/catalog/ext/modules/payment/paypal/express.php
>+%%WWWDIR%%/catalog/ext/modules/payment/paypal/express_uk.php
>+%%WWWDIR%%/catalog/ext/modules/payment/paypal/images/btn_express.gif
>+%%WWWDIR%%/catalog/ext/modules/payment/paypal/images/btn_express_espanol.gif
>+%%WWWDIR%%/catalog/ext/modules/payment/paypal/images/btn_express_german.gif
>+%%WWWDIR%%/catalog/ext/modules/payment/paypal/standard_ipn.php
> %%WWWDIR%%/catalog/ext/modules/payment/sofortueberweisung/callback.php
> %%WWWDIR%%/catalog/ext/modules/payment/sofortueberweisung/images/sofortueberweisung.gif
> %%WWWDIR%%/catalog/ext/modules/payment/worldpay/junior_callback.php
>@@ -687,16 +693,19 @@
> %%WWWDIR%%/catalog/includes/languages/english/modules/order_total/ot_subtotal.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/order_total/ot_tax.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/order_total/ot_total.php
>-%%WWWDIR%%/catalog/includes/languages/english/modules/payment/authorizenet.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/authorizenet_cc_aim.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/authorizenet_cc_sim.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/cc.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/chronopay.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/cod.php
>-%%WWWDIR%%/catalog/includes/languages/english/modules/payment/ipayment.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/ipayment_cc.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/moneyorder.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/nochex.php
>-%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal.php
>-%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal_ipn.php
>-%%WWWDIR%%/catalog/includes/languages/english/modules/payment/payquake_cc.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal_direct.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal_express.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal_standard.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal_uk_direct.php
>+%%WWWDIR%%/catalog/includes/languages/english/modules/payment/paypal_uk_express.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/pm2checkout.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/psigate.php
> %%WWWDIR%%/catalog/includes/languages/english/modules/payment/secpay.php
>@@ -781,16 +790,19 @@
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/order_total/ot_subtotal.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/order_total/ot_tax.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/order_total/ot_total.php
>-%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/authorizenet.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/authorizenet_cc_aim.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/authorizenet_cc_sim.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/cc.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/chronopay.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/cod.php
>-%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/ipayment.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/ipayment_cc.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/moneyorder.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/nochex.php
>-%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal.php
>-%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal_ipn.php
>-%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/payquake_cc.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal_direct.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal_express.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal_standard.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal_uk_direct.php
>+%%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/paypal_uk_express.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/pm2checkout.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/psigate.php
> %%WWWDIR%%/catalog/includes/languages/espanol/modules/payment/secpay.php
>@@ -875,16 +887,19 @@
> %%WWWDIR%%/catalog/includes/languages/german/modules/order_total/ot_subtotal.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/order_total/ot_tax.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/order_total/ot_total.php
>-%%WWWDIR%%/catalog/includes/languages/german/modules/payment/authorizenet.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/authorizenet_cc_aim.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/authorizenet_cc_sim.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/cc.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/chronopay.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/cod.php
>-%%WWWDIR%%/catalog/includes/languages/german/modules/payment/ipayment.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/ipayment_cc.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/moneyorder.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/nochex.php
>-%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal.php
>-%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal_ipn.php
>-%%WWWDIR%%/catalog/includes/languages/german/modules/payment/payquake_cc.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal_direct.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal_express.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal_standard.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal_uk_direct.php
>+%%WWWDIR%%/catalog/includes/languages/german/modules/payment/paypal_uk_express.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/pm2checkout.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/psigate.php
> %%WWWDIR%%/catalog/includes/languages/german/modules/payment/secpay.php
>@@ -908,7 +923,6 @@
> %%WWWDIR%%/catalog/includes/languages/german/specials.php
> %%WWWDIR%%/catalog/includes/languages/german/ssl_check.php
> %%WWWDIR%%/catalog/includes/languages/german/tell_a_friend.php
>-%%WWWDIR%%/catalog/includes/local/.cvsignore
> %%WWWDIR%%/catalog/includes/local/README
> %%WWWDIR%%/catalog/includes/modules/address_book_details.php
> %%WWWDIR%%/catalog/includes/modules/also_purchased_products.php
>@@ -920,16 +934,19 @@
> %%WWWDIR%%/catalog/includes/modules/order_total/ot_subtotal.php
> %%WWWDIR%%/catalog/includes/modules/order_total/ot_tax.php
> %%WWWDIR%%/catalog/includes/modules/order_total/ot_total.php
>-%%WWWDIR%%/catalog/includes/modules/payment/authorizenet.php
>+%%WWWDIR%%/catalog/includes/modules/payment/authorizenet_cc_aim.php
>+%%WWWDIR%%/catalog/includes/modules/payment/authorizenet_cc_sim.php
> %%WWWDIR%%/catalog/includes/modules/payment/cc.php
> %%WWWDIR%%/catalog/includes/modules/payment/chronopay.php
> %%WWWDIR%%/catalog/includes/modules/payment/cod.php
>-%%WWWDIR%%/catalog/includes/modules/payment/ipayment.php
>+%%WWWDIR%%/catalog/includes/modules/payment/ipayment_cc.php
> %%WWWDIR%%/catalog/includes/modules/payment/moneyorder.php
> %%WWWDIR%%/catalog/includes/modules/payment/nochex.php
>-%%WWWDIR%%/catalog/includes/modules/payment/paypal.php
>-%%WWWDIR%%/catalog/includes/modules/payment/paypal_ipn.php
>-%%WWWDIR%%/catalog/includes/modules/payment/payquake_cc.php
>+%%WWWDIR%%/catalog/includes/modules/payment/paypal_direct.php
>+%%WWWDIR%%/catalog/includes/modules/payment/paypal_express.php
>+%%WWWDIR%%/catalog/includes/modules/payment/paypal_standard.php
>+%%WWWDIR%%/catalog/includes/modules/payment/paypal_uk_direct.php
>+%%WWWDIR%%/catalog/includes/modules/payment/paypal_uk_express.php
> %%WWWDIR%%/catalog/includes/modules/payment/pm2checkout.php
> %%WWWDIR%%/catalog/includes/modules/payment/psigate.php
> %%WWWDIR%%/catalog/includes/modules/payment/secpay.php
>@@ -1053,6 +1070,7 @@
> @dirrm %%WWWDIR%%/catalog/ext/modules/payment/worldpay
> @dirrm %%WWWDIR%%/catalog/ext/modules/payment/sofortueberweisung/images
> @dirrm %%WWWDIR%%/catalog/ext/modules/payment/sofortueberweisung
>+@dirrm %%WWWDIR%%/catalog/ext/modules/payment/paypal/images
> @dirrm %%WWWDIR%%/catalog/ext/modules/payment/paypal
> @dirrm %%WWWDIR%%/catalog/ext/modules/payment/chronopay
> @dirrm %%WWWDIR%%/catalog/ext/modules/payment
>@@ -1098,6 +1116,7 @@
> @dirrm %%WWWDIR%%/catalog/admin/ext/modules/payment
> @dirrm %%WWWDIR%%/catalog/admin/ext/modules
> @dirrm %%WWWDIR%%/catalog/admin/ext
>+@dirrm %%WWWDIR%%/catalog/admin/backups
> @dirrm %%WWWDIR%%/catalog/admin
> @dirrm %%WWWDIR%%/catalog
> @dirrm %%WWWDIR%%

Actions: View | Diff

Attachments on bug 119926: 83999