Attachment 91063 Details for Bug 128355 – file.diff

[patch] file.diff

file.diff (text/plain), 9.35 KB, created by Nick Hilliard on 2008-10-24 20:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Hilliard

Created: 2008-10-24 20:50:01 UTC

Size: 9.35 KB

patch

obsolete

>diff -ur flyspray.old/Makefile flyspray/Makefile
>--- flyspray.old/Makefile	2007-09-05 15:53:57.000000000 +0100
>+++ flyspray/Makefile	2008-10-24 20:37:53.275513778 +0100
>@@ -6,23 +6,24 @@
> #
> 
> PORTNAME=	flyspray
>-PORTVERSION=	0.9.9.2
>-PORTREVISION=	1
>+PORTVERSION=	0.9.9.5.1
> CATEGORIES=	devel www
>-MASTER_SITES=	http://www.flyspray.org/
>+MASTER_SITES=	http://twinkie.foobar.org/files/
> 
> MAINTAINER=	nick@foobar.org
> COMMENT=	A simple, easy-to-use web based bug tracking system
> 
> RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
> 
>-USE_PHP=	mysql pcre session zlib xml gd
>+USE_PHP=	pcre session zlib xml gd
> USE_BZIP2=	yes
> WANT_PHP_WEB=	yes
> 
> NO_BUILD=	yes
> 
>-OPTIONS=	GRAPHVIZ "Install Graphviz for task dependency graphs" off
>+OPTIONS=	GRAPHVIZ "Install Graphviz for task dependency graphs" off \
>+		MYSQLI "Use MySQLi Database Interface" on \
>+		MYSQL "Use MySQL Database Interface" off
> 
> FLYSPRAYDIR=	${PREFIX}/share/${PORTNAME}
> ATTACHMENTDIR=	${DBDIR}/${PORTNAME}/attachments
>@@ -52,6 +53,14 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if !defined(WITHOUT_MYSQL)
>+USE_PHP+=	mysql
>+.endif
>+
>+.if !defined(WITHOUT_MYSQLI)
>+USE_PHP+=	mysqli
>+.endif
>+
> .ifdef WITH_GRAPHVIZ
> RUN_DEPENDS+=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
> .endif
>@@ -66,13 +75,14 @@
> do-install:
> 	${MKDIR} ${FLYSPRAYDIR}
> 	${CHMOD} 755 ${FLYSPRAYDIR}
>-	${CP} ${WRKSRC}/setup/upgrade/${PORTVERSION}/flyspray.conf.php ${WRKSRC}/flyspray.conf.php-dist
>+	${CP} ${WRKSRC}/setup/upgrade/0.9.9.5/flyspray.conf.php ${WRKSRC}/flyspray.conf.php-dist
>+	${TOUCH} ${FLYSPRAYDIR}/flyspray.conf.php
> 	cd ${WRKSRC} && \
> 		${TAR} cf - ${FLYSPRAY_FILES} | \
> 		(cd ${FLYSPRAYDIR} && ${TAR} -xf -)
> 	${LN} -s ${ATTACHMENTDIR} ${FLYSPRAYDIR}/attachments
> 	${LN} -s ${PREFIX}/share/adodb ${FLYSPRAYDIR}
>-	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/cache
>+	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/cache ${FLYSPRAYDIR}/flyspray.conf.php
> 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
> post-install: install-doc
>diff -ur flyspray.old/distinfo flyspray/distinfo
>--- flyspray.old/distinfo	2007-08-16 12:23:26.000000000 +0100
>+++ flyspray/distinfo	2008-10-24 20:15:15.150030074 +0100
>@@ -1,3 +1,3 @@
>-MD5 (flyspray-0.9.9.2.tar.bz2) = 84e8e2a11ccf3ff4e95e182c6751ddf7
>-SHA256 (flyspray-0.9.9.2.tar.bz2) = 8960525b7777d919f665be1c94785fa2f76083b3eee43b0da3166d12f0bbb947
>-SIZE (flyspray-0.9.9.2.tar.bz2) = 945582
>+MD5 (flyspray-0.9.9.5.1.tar.bz2) = 54c5327b507349f2963a3d899f5b9d91
>+SHA256 (flyspray-0.9.9.5.1.tar.bz2) = 6bd3d9bee474feb2e75cdf181bba750655068ad35b05ba677e632dbd5e5bfd4a
>+SIZE (flyspray-0.9.9.5.1.tar.bz2) = 971055
>diff -ur flyspray.old/files/README.FreeBSD flyspray/files/README.FreeBSD
>--- flyspray.old/files/README.FreeBSD	2007-09-05 15:53:58.000000000 +0100
>+++ flyspray/files/README.FreeBSD	2008-10-24 20:43:23.116397748 +0100
>@@ -41,6 +41,7 @@
> 7) Report any bugs you find back to http://bugs.flyspray.org/ or the mailing
>    list linked from the Flyspray homepage.
> 
>+8) Note that this version of Flyspray does not support PostgreSQL.
> 
> Upgrading from previous versions of Flyspray
> ============================================
>@@ -52,7 +53,11 @@
> 1) back up your old flyspray task database using "mysqldump".  No, really,
>    you seriously run the risk of losing data if you don't do this.
> 
>-2) load http://yourserver.example.com/flyspray/setup/upgrade.php in your
>+2) save a copy of %%FLYSPRAYDIR%%/flyspray.conf.php before running
>+   portupgrade.  This will need to be restored after you've upgraded the
>+   package.
>+
>+3) load http://yourserver.example.com/flyspray/setup/upgrade.php in your
>    browser and follow the instructions.  If upgrading from 0.9.9beta2,
>    manually change the value of "fs_ver" in the {dbprefix}prefs table of
>    your Flyspray DB to "0.9.9 dev".  You can do this using the folowing SQL
>@@ -60,7 +65,7 @@
> 
> sql> update flyspray_prefs set pref_value = "0.9.9 dev" where pref_name = "fs_ver";
> 
>-3) That's it! Flyspray has been upgraded to 0.9.9.2.  If you messed up
>+4) That's it! Flyspray has been upgraded to the current version.  If you messed up
>    somehow, you will probably have lost data in the process, and may need to
>    re-install your database from your backup, but that's ok because you took
>    a backup, right?
>diff -ur flyspray.old/pkg-plist flyspray/pkg-plist
>--- flyspray.old/pkg-plist	2007-09-05 15:53:57.000000000 +0100
>+++ flyspray/pkg-plist	2008-10-24 20:14:41.565044002 +0100
>@@ -20,6 +20,7 @@
> %%DATADIR%%/includes/constants.inc.php
> %%DATADIR%%/includes/events.inc.php
> %%DATADIR%%/includes/external/Validate.php
>+%%DATADIR%%/includes/external/http_build_query.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Events/ListenerMapper.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Events/ResponseEvent.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Events/CommandEvent.php
>@@ -36,7 +37,6 @@
> %%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Multi.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Rotator.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Connection/SMTP.php
>-%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Exception.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/CacheFactory.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Message/EmbeddedFile.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Message/Encoder.php
>@@ -52,16 +52,18 @@
> %%DATADIR%%/includes/external/swift-mailer/Swift/Errors.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Log.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/ConnectionBase.php
>+%%DATADIR%%/includes/external/swift-mailer/Swift/ConnectionException.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/FileException.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/File.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PopB4Smtp/Pop3Connection.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PLAIN.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/CRAMMD5.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/LOGIN.php
>-%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/$PopB4Smtp$.php
>+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/@PopB4Smtp.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/BadResponseException.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Iterator/Array.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Iterator/MySQLResult.php
>+%%DATADIR%%/includes/external/swift-mailer/Swift/LogContainer.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Message.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Exception.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Address.php
>@@ -78,7 +80,6 @@
> %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/VerboseSending.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/BandwidthMonitor.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/MailSend.php
>-%%DATADIR%%/includes/external/swift-mailer/Swift/Log/Base.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Log/DefaultLog.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Cache/OutputStream.php
> %%DATADIR%%/includes/external/swift-mailer/Swift/Cache/JointOutputStream.php
>@@ -99,7 +100,6 @@
> %%DATADIR%%/javascript/callbacks/getsearches.php
> %%DATADIR%%/javascript/callbacks/savesearches.php
> %%DATADIR%%/javascript/callbacks/searchnames.php
>-%%DATADIR%%/javascript/callbacks/useradd.php
> %%DATADIR%%/javascript/callbacks/usersearch.php
> %%DATADIR%%/javascript/details.js
> %%DATADIR%%/javascript/functions.js
>@@ -195,6 +195,7 @@
> %%DATADIR%%/lang/en.php
> %%DATADIR%%/lang/es.php
> %%DATADIR%%/lang/fr.php
>+%%DATADIR%%/lang/hu.php
> %%DATADIR%%/lang/it.php
> %%DATADIR%%/lang/ja.php
> %%DATADIR%%/lang/nl.php
>@@ -390,6 +391,7 @@
> %%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_wink.gif
> %%DATADIR%%/plugins/dokuwiki/lib/plugins/changelinks/syntax.php
> %%DATADIR%%/plugins/dokuwiki/lib/plugins/fslink/syntax.php
>+%%DATADIR%%/plugins/dokuwiki/lib/plugins/newline/syntax.php
> %%DATADIR%%/plugins/dokuwiki/lib/plugins/syntax.php
> %%DATADIR%%/robots.txt
> %%DATADIR%%/schedule.php
>@@ -441,6 +443,14 @@
> %%DATADIR%%/setup/upgrade/0.9.9.2/upgrade.info
> %%DATADIR%%/setup/upgrade/0.9.9.2/flyspray.conf.php
> %%DATADIR%%/setup/upgrade/0.9.9.2/flyspray-install.xml
>+%%DATADIR%%/setup/upgrade/0.9.9.4/flyspray-install.xml
>+%%DATADIR%%/setup/upgrade/0.9.9.4/flyspray.conf.php
>+%%DATADIR%%/setup/upgrade/0.9.9.4/upgrade.info
>+%%DATADIR%%/setup/upgrade/0.9.9.4/upgrade.xml
>+%%DATADIR%%/setup/upgrade/0.9.9.5/flyspray-install.xml
>+%%DATADIR%%/setup/upgrade/0.9.9.5/flyspray.conf.php
>+%%DATADIR%%/setup/upgrade/0.9.9.5/upgrade.info
>+%%DATADIR%%/setup/upgrade/0.9.9.5/upgrade.xml
> %%DATADIR%%/templates/.htaccess
> %%DATADIR%%/templates/admin.cat.tpl
> %%DATADIR%%/templates/admin.editgroup.tpl
>@@ -634,6 +644,7 @@
> @dirrm %%DATADIR%%/plugins/dokuwiki/lib/images
> @dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins/changelinks
> @dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins/fslink
>+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins/newline
> @dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins
> @dirrm %%DATADIR%%/plugins/dokuwiki/lib
> @dirrm %%DATADIR%%/plugins/dokuwiki
>@@ -644,6 +655,8 @@
> @dirrm %%DATADIR%%/setup/templates
> @dirrm %%DATADIR%%/setup/upgrade/0.9.9
> @dirrm %%DATADIR%%/setup/upgrade/0.9.9.2
>+@dirrm %%DATADIR%%/setup/upgrade/0.9.9.4
>+@dirrm %%DATADIR%%/setup/upgrade/0.9.9.5
> @dirrm %%DATADIR%%/setup/upgrade
> @dirrm %%DATADIR%%/setup
> @dirrm %%DATADIR%%/templates

Actions: View | Diff

Attachments on bug 128355: 91063