pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update to 1.1.3.1nb20151112, and switch to new gitlab.com repository.

Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Thu Nov 12 16:43:38 2015 +0100
Changeset:	496f9ebb4b758587b65ccb712644da6c5f199e08

Modified Files:
	davical-current/Makefile
	davical-current/PLIST
	davical-current/distinfo
Added Files:
	davical-current/patches/patch-dba_create-database.sh
	davical-current/patches/patch-dba_update-davical-database
	davical-current/patches/patch-inc_always.php.in
	davical-current/patches/patch-inc_davical__configuration__missing.php
	davical-current/patches/patch-scripts_po_rebuild-translations.sh
Removed Files:
	davical-current/patches/patch-aa
	davical-current/patches/patch-ab
	davical-current/patches/patch-ac
	davical-current/patches/patch-ad
	davical-current/patches/patch-ae
	davical-current/patches/patch-scripts_build-always.sh

Log Message:
Update to 1.1.3.1nb20151112, and switch to new gitlab.com repository.

While we are here, rebuild patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=496f9ebb4b758587b65ccb712644da6c5f199e08

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 davical-current/Makefile                           |  8 ++-
 davical-current/PLIST                              | 76 +++++-----------------
 davical-current/distinfo                           | 11 ++--
 davical-current/patches/patch-aa                   | 22 -------
 davical-current/patches/patch-ab                   | 29 ---------
 davical-current/patches/patch-ac                   | 13 ----
 davical-current/patches/patch-ad                   | 13 ----
 davical-current/patches/patch-ae                   | 13 ----
 .../patches/patch-dba_create-database.sh           | 23 +++++++
 .../patches/patch-dba_update-davical-database      | 13 ++++
 davical-current/patches/patch-inc_always.php.in    | 29 +++++++++
 .../patch-inc_davical__configuration__missing.php  | 13 ++++
 .../patches/patch-scripts_build-always.sh          | 13 ----
 .../patch-scripts_po_rebuild-translations.sh       | 14 ++++
 14 files changed, 120 insertions(+), 170 deletions(-)

diffs:
diff --git a/davical-current/Makefile b/davical-current/Makefile
index 1ba27e1..1b8db0d 100644
--- a/davical-current/Makefile
+++ b/davical-current/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.1
+DAVICAL_VERSION=1.1.3.1
 PKGREVISION=    ${_GIT_PKGVERSION:S/.//g}
 CATEGORIES=	www
 MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/
@@ -14,8 +14,10 @@ COMMENT=	Simple CalDAV server using a PostgreSQL backend
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3
 
 GIT_REPOSITORIES=       master
-GIT_REPO.master=        git://repo.or.cz/${PKGBASE}.git
-GIT_MODULE.master=      ${PKGBASE}
+GIT_REPO.master=        https://gitlab.com/davical-project/davical.git
+GIT_MODULE.master=      davical
+# for "SSL certificate problem: unable to get local issuer certificate"
+GIT_ENV+=	GIT_SSL_NO_VERIFY=true
 
 DAVICALDIR=	${PREFIX}/share/davical
 EGDIR=		${PREFIX}/share/examples/davical
diff --git a/davical-current/PLIST b/davical-current/PLIST
index 2a77366..be24dbf 100644
--- a/davical-current/PLIST
+++ b/davical-current/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2013/07/17 15:10:48 hfath Exp $
+@comment $NetBSD$
 share/davical/dba/appuser_permissions.txt
 share/davical/dba/base-data.sql
 share/davical/dba/better_perms.sql
 share/davical/dba/caldav_functions.sql
 share/davical/dba/create-database.sh
 share/davical/dba/davical.sql
-share/davical/dba/patches/${PKGVERSION}0.sql
-share/davical/dba/patches/${PKGVERSION}1.sql
-share/davical/dba/patches/${PKGVERSION}1a.sql
-share/davical/dba/patches/${PKGVERSION}2.sql
-share/davical/dba/patches/${PKGVERSION}2a.sql
+share/davical/dba/patches/1.1.10.sql
+share/davical/dba/patches/1.1.11.sql
+share/davical/dba/patches/1.1.11a.sql
+share/davical/dba/patches/1.1.12.sql
+share/davical/dba/patches/1.1.12a.sql
 share/davical/dba/patches/1.1.2.sql
 share/davical/dba/patches/1.1.3.sql
 share/davical/dba/patches/1.1.4.sql
@@ -22,6 +22,7 @@ share/davical/dba/patches/1.2.1.sql
 share/davical/dba/patches/1.2.10.sql
 share/davical/dba/patches/1.2.10a.sql
 share/davical/dba/patches/1.2.11.sql
+share/davical/dba/patches/1.2.12.sql
 share/davical/dba/patches/1.2.1a.sql
 share/davical/dba/patches/1.2.1b.sql
 share/davical/dba/patches/1.2.2.sql
@@ -136,6 +137,10 @@ share/davical/inc/ui/principal-edit.php
 share/davical/inc/vcard.php
 share/davical/inc/vtimezone.php
 share/davical/inc/well-known.php
+share/davical/po/ar.po
+share/davical/po/ar.values
+share/davical/po/ca.po
+share/davical/po/cs_CZ.po
 share/davical/po/de.po
 share/davical/po/de.values
 share/davical/po/es_AR.po
@@ -148,14 +153,19 @@ share/davical/po/es_VE.po
 share/davical/po/es_VE.values
 share/davical/po/et.po
 share/davical/po/et.values
+share/davical/po/fi.po
+share/davical/po/fi.values
 share/davical/po/fr.po
 share/davical/po/fr.values
 share/davical/po/hu.po
 share/davical/po/hu.values
+share/davical/po/id_ID.po
 share/davical/po/it.po
 share/davical/po/it.values
 share/davical/po/ja.po
 share/davical/po/ja.values
+share/davical/po/ko_KR.po
+share/davical/po/ko_KR.values
 share/davical/po/messages.pot
 share/davical/po/nb_NO.po
 share/davical/po/nb_NO.values
@@ -170,6 +180,8 @@ share/davical/po/pt_PT.po
 share/davical/po/pt_PT.values
 share/davical/po/ru.po
 share/davical/po/ru.values
+share/davical/po/sk_SK.po
+share/davical/po/sk_SK.values
 share/davical/po/sv.po
 share/davical/po/sv.values
 share/davical/scripts/archive-old-events.php
@@ -391,58 +403,6 @@ share/doc/davical/api/phpdoc.ini
 share/doc/davical/api/todolist.html
 share/doc/davical/davical_en_user_guide.odt
 share/doc/davical/translation.rst
-share/doc/davical/website/administration.php
-share/doc/davical/website/background.php
-share/doc/davical/website/clients.php
-share/doc/davical/website/clients/Chandler-details.php
-share/doc/davical/website/clients/Chandler-dialog1.png
-share/doc/davical/website/clients/Chandler-dialog2.png
-share/doc/davical/website/clients/Chandler-dialog3.png
-share/doc/davical/website/clients/Chandler-icon.png
-share/doc/davical/website/clients/Chandler-screenshot.png
-share/doc/davical/website/clients/Evolution-details.php
-share/doc/davical/website/clients/Evolution-dialog1.png
-share/doc/davical/website/clients/Evolution-icon.png
-share/doc/davical/website/clients/Evolution-screenshot.png
-share/doc/davical/website/clients/Interoperability-details.php
-share/doc/davical/website/clients/Mozilla-details.php
-share/doc/davical/website/clients/Mozilla-dialog1.png
-share/doc/davical/website/clients/Mozilla-dialog2.png
-share/doc/davical/website/clients/Mozilla-dialog3.png
-share/doc/davical/website/clients/Mozilla-icon.png
-share/doc/davical/website/clients/Mozilla-screenshot.png
-share/doc/davical/website/clients/Mulberry-details.php
-share/doc/davical/website/clients/Mulberry-dialog1.png
-share/doc/davical/website/clients/Mulberry-dialog2.png
-share/doc/davical/website/clients/Mulberry-icon.png
-share/doc/davical/website/clients/Mulberry-screenshot.png
-share/doc/davical/website/clients/Other-details.php
-share/doc/davical/website/clients/iCal-details.php
-share/doc/davical/website/clients/iCal-dialog.png
-share/doc/davical/website/clients/iCal-icon.png
-share/doc/davical/website/clients/iCal-screenshot.png
-share/doc/davical/website/clients/iPhone-1.png
-share/doc/davical/website/clients/iPhone-2.png
-share/doc/davical/website/clients/iPhone-3.png
-share/doc/davical/website/clients/iPhone-4.png
-share/doc/davical/website/clients/iPhone-details.php
-share/doc/davical/website/clients/ical4/001.png
-share/doc/davical/website/clients/ical4/002.png
-share/doc/davical/website/clients/ical4/003.png
-share/doc/davical/website/images/davical_logo.ico
-share/doc/davical/website/images/davical_logo.svg
-share/doc/davical/website/images/flattr-badge-large.png
-share/doc/davical/website/images/icon.png
-share/doc/davical/website/images/larger.png
-share/doc/davical/website/images/logo.gif
-share/doc/davical/website/images/paypal_donate_button.png
-share/doc/davical/website/inc/page-footer.php
-share/doc/davical/website/inc/page-header.php
-share/doc/davical/website/inc/page-middle.php
-share/doc/davical/website/index.php
-share/doc/davical/website/installation.php
-share/doc/davical/website/style.css
-share/doc/davical/website/wikiheader.css
 share/examples/davical/config/apache-davical.conf
 share/examples/davical/config/debug-config.php
 share/examples/davical/config/example-administration.yml
diff --git a/davical-current/distinfo b/davical-current/distinfo
index eeb4305..b971361 100644
--- a/davical-current/distinfo
+++ b/davical-current/distinfo
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.4 2013/11/07 12:39:31 noud4 Exp $
 
-SHA1 (patch-aa) = 3172ea7a359e1779431d732d0f1cb106e3b4dd4e
-SHA1 (patch-ab) = d9c4c6729e7be6968306bdd96ed4269c0887a885
-SHA1 (patch-ac) = 74e9b103d502886736dff4fa659fb3e50bae5032
-SHA1 (patch-ad) = 7816ff4ee7440911e275f3152089760e82b5d180
-SHA1 (patch-ae) = e3f2b5c002c8289d40cd025a38c382d402fc659e
-SHA1 (patch-scripts_build-always.sh) = 528aef5225f83908786aa1ba6ee176e87db64a15
+SHA1 (patch-dba_create-database.sh) = d5719354896873badce2ffa0a7718870f0c705c2
+SHA1 (patch-dba_update-davical-database) = 7ac756cff0949090b54f4cdfa709c07198b6366c
+SHA1 (patch-inc_always.php.in) = 0a818cb04dd64df25ba15b04b5eb38a2dffd8438
+SHA1 (patch-inc_davical__configuration__missing.php) = 27d0fab4ff8770acf07a12b19cadb8ac059381e2
+SHA1 (patch-scripts_po_rebuild-translations.sh) = 864692ee896a71171a12127bab883321b6f77c81
diff --git a/davical-current/patches/patch-aa b/davical-current/patches/patch-aa
deleted file mode 100644
index 2c3ba71..0000000
--- a/davical-current/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
---- dba/create-database.sh.orig	2010-10-17 19:00:55.000000000 +0000
-+++ dba/create-database.sh
-@@ -16,7 +16,7 @@ testawldir() {
- 
- #
- # Attempt to locate the AWL directory
--AWLDIR="${DBADIR}/../../awl"
-+AWLDIR="@LIBAWLPATH@"
- if ! testawldir "${AWLDIR}"; then
-   AWLDIR="/usr/share/awl"
-   if ! testawldir "${AWLDIR}"; then
-@@ -175,7 +175,7 @@ rm "${INSTALL_NOTE_FN}"
- cat <<FRIENDLY
- *  The password for the 'admin' user has been set to '${ADMINPW}'
- 
--Thanks for trying DAViCal!  Check in /usr/share/doc/davical/examples/ for
-+Thanks for trying DAViCal!  Check in @EGDIRCONFIG@/ for
- some configuration examples.  For help, visit #davical on irc.oftc.net.
- 
- FRIENDLY
diff --git a/davical-current/patches/patch-ab b/davical-current/patches/patch-ab
deleted file mode 100644
index d18d870..0000000
--- a/davical-current/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
---- inc/always.php.in.orig	2011-09-25 09:04:29.000000000 +0000
-+++ inc/always.php.in
-@@ -79,7 +79,7 @@ if ( ! @include_once('AWLUtilities.php')
-         '../../awl/inc'
-       , '/usr/share/awl/inc'        // Where it ends up on Debian
-       , '/usr/share/php/awl/inc'    // Fedora's standard for PHP libraries
--      , '/usr/local/share/awl/inc'
-+      , '@LIBAWLPATH@/inc'
-   );
-   foreach( $try_paths AS $awl_include_path ) {
-     if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) {
-@@ -131,11 +131,11 @@ if ( @file_exists('/etc/davical/'.$_SERV
- else if ( @file_exists('/etc/davical/config.php') ) {
-   include('/etc/davical/config.php');
- }
--else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
--  include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
-+else if ( @file_exists('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
-+  include('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php');
- }
--else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
--  include('/usr/local/etc/davical/config.php');
-+else if ( @file_exists('@PKG_SYSCONFDIR@/config.php') ) {
-+  include('@PKG_SYSCONFDIR@/config.php');
- }
- else if ( @file_exists('../config/config.php') ) {
-   include('../config/config.php');
diff --git a/davical-current/patches/patch-ac b/davical-current/patches/patch-ac
deleted file mode 100644
index 6480b00..0000000
--- a/davical-current/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
---- dba/update-davical-database.orig	2010-03-09 02:51:21.000000000 +0000
-+++ dba/update-davical-database
-@@ -23,7 +23,7 @@ my $helpmeplease = 0;
- my $apply_patches = 1;
- my $revoke_list = "";
- my $force_owner = "";
--my $config_file = "config/administration.yml";
-+my $config_file = "@PKG_SYSCONFDIR@/administration.yml";
- 
- my $dbadir = $0;
- $dbadir =~ s#/[^/]*$##;
diff --git a/davical-current/patches/patch-ad b/davical-current/patches/patch-ad
deleted file mode 100644
index 317db9f..0000000
--- a/davical-current/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
---- scripts/po/rebuild-translations.sh.orig	2011-09-11 11:46:40.000000000 +0000
-+++ scripts/po/rebuild-translations.sh
-@@ -10,7 +10,7 @@
- PODIR="po"
- LOCALEDIR="locale"
- APPLICATION="davical"
--AWL_LOCATION="../awl"
-+AWL_LOCATION="@LIBAWLPATH@"
- 
- if [ ! -d "${AWL_LOCATION}" ]; then
-   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
diff --git a/davical-current/patches/patch-ae b/davical-current/patches/patch-ae
deleted file mode 100644
index 410ef8d..0000000
--- a/davical-current/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
---- inc/davical_configuration_missing.php.orig	2011-09-11 11:46:40.000000000 +0000
-+++ inc/davical_configuration_missing.php
-@@ -4,7 +4,7 @@ include("page-header.php");
-   echo <<<EOBODY
- <h1>DAViCal Not Configured</h1>
- <h2>The Bad News</h2>
--<p>There is no configuration file present in <b>/etc/davical/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
-+<p>There is no configuration file present in <b>@PKG_SYSCONFDIR@/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
-    your installation is not fully set up.</p>
- <h2>The Good News</h2>
- <p>Well, you're seeing this! At least you have DAViCal <i>installed</i> :-) You also have Apache and PHP working
diff --git a/davical-current/patches/patch-dba_create-database.sh b/davical-current/patches/patch-dba_create-database.sh
new file mode 100644
index 0000000..f5e3450
--- /dev/null
+++ b/davical-current/patches/patch-dba_create-database.sh
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- dba/create-database.sh.orig	2015-11-12 14:35:57.000000000 +0000
++++ dba/create-database.sh
+@@ -12,7 +12,8 @@ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXX
+ 
+ 
+ # Candidate locations of the AWL directory
+-awldirs="${DBADIR}/../../awl
++awldirs="@LIBAWLPATH@
++${DBADIR}/../../awl
+ /usr/share/awl
+ /usr/share/php/awl
+ /usr/local/share/awl"
+@@ -182,7 +183,7 @@ rm "${INSTALL_NOTE_FN}"
+ cat <<FRIENDLY
+ *  The password for the 'admin' user has been set to '${ADMINPW}'
+ 
+-Thanks for trying DAViCal!  Check in /usr/share/doc/davical/examples/ for
++Thanks for trying DAViCal!  Check in @EGDIRCONFIG@/ for
+ some configuration examples.  For help, visit #davical on irc.oftc.net.
+ 
+ FRIENDLY
diff --git a/davical-current/patches/patch-dba_update-davical-database b/davical-current/patches/patch-dba_update-davical-database
new file mode 100644
index 0000000..ed6eaa3
--- /dev/null
+++ b/davical-current/patches/patch-dba_update-davical-database
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dba/update-davical-database.orig	2015-11-12 14:35:57.000000000 +0000
++++ dba/update-davical-database
+@@ -23,7 +23,7 @@ my $helpmeplease = 0;
+ my $apply_patches = 1;
+ my $revoke_list = "";
+ my $force_owner = "";
+-my $config_file = "config/administration.yml";
++my $config_file = "@PKG_SYSCONFDIR@/administration.yml";
+ 
+ my $dbadir = $0;
+ $dbadir =~ s#/[^/]*$##;
diff --git a/davical-current/patches/patch-inc_always.php.in b/davical-current/patches/patch-inc_always.php.in
new file mode 100644
index 0000000..01ee49c
--- /dev/null
+++ b/davical-current/patches/patch-inc_always.php.in
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- inc/always.php.in.orig	2015-11-12 14:35:57.000000000 +0000
++++ inc/always.php.in
+@@ -105,7 +105,7 @@ if ( ! @include_once('AWLUtilities.php')
+         '../../awl/inc'
+       , '/usr/share/awl/inc'        // Where it ends up on Debian
+       , '/usr/share/php/awl/inc'    // Fedora's standard for PHP libraries
+-      , '/usr/local/share/awl/inc'
++      , '@LIBAWLPATH@/inc'
+   );
+   foreach( $try_paths AS $awl_include_path ) {
+     if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) {
+@@ -158,11 +158,11 @@ if ( @file_exists('/etc/davical/'.$_SERV
+ else if ( @file_exists('/etc/davical/config.php') ) {
+   include('/etc/davical/config.php');
+ }
+-else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
+-  include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
++else if ( @file_exists('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
++  include('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php');
+ }
+-else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
+-  include('/usr/local/etc/davical/config.php');
++else if ( @file_exists('@PKG_SYSCONFDIR@/config.php') ) {
++  include('@PKG_SYSCONFDIR@/config.php');
+ }
+ else if ( @file_exists('../config/config.php') ) {
+   include('../config/config.php');
diff --git a/davical-current/patches/patch-inc_davical__configuration__missing.php b/davical-current/patches/patch-inc_davical__configuration__missing.php
new file mode 100644
index 0000000..8e39d29
--- /dev/null
+++ b/davical-current/patches/patch-inc_davical__configuration__missing.php
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- inc/davical_configuration_missing.php.orig	2015-11-12 14:35:57.000000000 +0000
++++ inc/davical_configuration_missing.php
+@@ -4,7 +4,7 @@ include("page-header.php");
+   echo <<<EOBODY
+ <h1>DAViCal Not Configured</h1>
+ <h2>The Bad News</h2>
+-<p>There is no configuration file present in <b>/etc/davical/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
++<p>There is no configuration file present in <b>@PKG_SYSCONFDIR@/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
+    your installation is not fully set up.</p>
+ <h2>The Good News</h2>
+ <p>Well, you're seeing this! At least you have DAViCal <i>installed</i> :-) You also have Apache and PHP working
diff --git a/davical-current/patches/patch-scripts_build-always.sh b/davical-current/patches/patch-scripts_build-always.sh
deleted file mode 100644
index 3128eaa..0000000
--- a/davical-current/patches/patch-scripts_build-always.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-scripts_build-always.sh,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
---- scripts/build-always.sh.orig	2011-09-11 11:46:40.000000000 +0000
-+++ scripts/build-always.sh
-@@ -7,7 +7,7 @@ DAVICAL_VERSION="`head -n1 VERSION`"
- DB_VERSION="`grep 'SELECT new_db_revision' dba/davical.sql | cut -f2 -d'(' | cut -f1-3 -d,`"
- AWL_VERSION="`head -n1 ../awl/VERSION`"
- if [ -z "${AWL_VERSION}" ] ; then
--  AWL_VERSION="'`grep 'want_awl_version' inc/always.php.in | cut -f2 -d= | cut -f1 -d';' | sed 's: ::g'`'"  
-+  AWL_VERSION="`grep 'want_awl_version' inc/always.php.in | cut -f2 -d= | cut -f1 -d';' | sed 's: ::g'`"  
- fi
- 
- sed -e "/^ *.c->version_string *= *'[^']*' *;/ s/^ *.c->version_string *= *'[^']*' *;/\$c->version_string = '${DAVICAL_VERSION}';/" \
diff --git a/davical-current/patches/patch-scripts_po_rebuild-translations.sh b/davical-current/patches/patch-scripts_po_rebuild-translations.sh
new file mode 100644
index 0000000..d592d6d
--- /dev/null
+++ b/davical-current/patches/patch-scripts_po_rebuild-translations.sh
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- scripts/po/rebuild-translations.sh.orig	2015-11-12 14:35:57.000000000 +0000
++++ scripts/po/rebuild-translations.sh
+@@ -11,7 +11,8 @@ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+ 
+-awldirs="../awl
++awldirs="@LIBAWLPATH@
++../awl
+ `find .. -type d -name 'awl-*.*'`
+ /usr/share/awl
+ /usr/share/php/awl
Home | Main Index | Thread Index | Old Index