[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Mar-2006 09:11:15 Branch: HEAD Handle: 2006031108111500 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrade to GNU config 20060310 Summary: RevisionChanges Path 1.319 +1 -0 openpkg-src/openpkg/HISTORY 1.472 +2 -2 openpkg-src/openpkg/openpkg.spec patch -p0 '@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.318 -r1.319 HISTORY --- openpkg-src/openpkg/HISTORY 7 Mar 2006 19:58:24 - 1.318 +++ openpkg-src/openpkg/HISTORY 11 Mar 2006 08:11:15 - 1.319 @@ -2,6 +2,7 @@ 2006 +20060311 upgrade to GNU config 20060310 20060307 fixed Solaris 10 svc manifest 20060307 cleanup building of GNU Bash 20060306 fixed building of GNU Bash by reducing dependency to Bison/Yacc @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.471 -r1.472 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 7 Mar 2006 19:58:24 - 1.471 +++ openpkg-src/openpkg/openpkg.spec 11 Mar 2006 08:11:15 - 1.472 @@ -38,7 +38,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20060307 +%define V_openpkg 20060311 # the used software versions %define V_rpm 4.2.1 @@ -52,7 +52,7 @@ %define V_tar 1.15.1 %define V_bash 3.1 %define V_uuid 1.4.1 -%define V_config 20060206 +%define V_config 20060310 # package information Name: openpkg @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/flowd/ flowd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 09:18:35
Branch: HEAD Handle: 2006031108183400
Modified files:
openpkg-src/flowd flowd.spec
Log:
requires Berkeley YACC and rejects GNU Bison
Summary:
RevisionChanges Path
1.10+2 -2 openpkg-src/flowd/flowd.spec
patch -p0 '@@ .'
Index: openpkg-src/flowd/flowd.spec
$ cvs diff -u -r1.9 -r1.10 flowd.spec
--- openpkg-src/flowd/flowd.spec 2 Mar 2006 14:23:02 - 1.9
+++ openpkg-src/flowd/flowd.spec 11 Mar 2006 08:18:34 - 1.10
@@ -33,7 +33,7 @@
Group:Network
License: BSD
Version: 0.9
-Release: 20060302
+Release: 20060311
# package options
%option with_fsl yes
@@ -49,7 +49,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, bison
+BuildPreReq: OpenPKG, openpkg = 20040130, byacc
PreReq: OpenPKG, openpkg = 20040130
%if %{with_fsl} == yes
BuildPreReq: fsl = 1.2.0
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libsndfile/ libsndfile.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 09:21:50
Branch: HEAD Handle: 2006031108215000
Modified files:
openpkg-src/libsndfile libsndfile.spec
Log:
fix permissions on install-sh file
Summary:
RevisionChanges Path
1.25+2 -1 openpkg-src/libsndfile/libsndfile.spec
patch -p0 '@@ .'
Index: openpkg-src/libsndfile/libsndfile.spec
$ cvs diff -u -r1.24 -r1.25 libsndfile.spec
--- openpkg-src/libsndfile/libsndfile.spec21 Feb 2006 18:37:16 -
1.24
+++ openpkg-src/libsndfile/libsndfile.spec11 Mar 2006 08:21:50 -
1.25
@@ -33,7 +33,7 @@
Group:Audio
License: LGPL
Version: 1.0.14
-Release: 20060221
+Release: 20060311
# list of sources
Source0:
http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
@@ -63,6 +63,7 @@
%{l_shtool} subst \
-e 's;@SHELL@;%{l_bash};g' \
Makefile.in */Makefile.in
+chmod a+x install-sh
%build
CC=%{l_cc} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/freetds/ freetds.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 09:27:19
Branch: HEAD Handle: 2006031108271900
Modified files:
openpkg-src/freetds freetds.spec
Log:
requires GNU readline for command line tool
Summary:
RevisionChanges Path
1.12+3 -3 openpkg-src/freetds/freetds.spec
patch -p0 '@@ .'
Index: openpkg-src/freetds/freetds.spec
$ cvs diff -u -r1.11 -r1.12 freetds.spec
--- openpkg-src/freetds/freetds.spec 1 Jan 2006 13:13:41 - 1.11
+++ openpkg-src/freetds/freetds.spec 11 Mar 2006 08:27:19 - 1.12
@@ -33,7 +33,7 @@
Group:Database
License: LGPL
Version: 0.63
-Release: 20050824
+Release: 20060311
# package options
%option with_odbcno
@@ -48,8 +48,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20040130
PreReq: OpenPKG, openpkg = 20040130
-BuildPreReq: libiconv
-PreReq: libiconv
+BuildPreReq: libiconv, readline
+PreReq: libiconv, readline
%if %{with_odbc} == yes
BuildPreReq: unixodbc
PreReq: unixodbc
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libgsf/ libgsf.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 09:30:11
Branch: HEAD Handle: 2006031108301000
Modified files:
openpkg-src/libgsf libgsf.spec
Log:
requires Perl and XML::Parser
Summary:
RevisionChanges Path
1.5 +2 -2 openpkg-src/libgsf/libgsf.spec
patch -p0 '@@ .'
Index: openpkg-src/libgsf/libgsf.spec
$ cvs diff -u -r1.4 -r1.5 libgsf.spec
--- openpkg-src/libgsf/libgsf.spec2 Mar 2006 07:44:50 - 1.4
+++ openpkg-src/libgsf/libgsf.spec11 Mar 2006 08:30:10 - 1.5
@@ -37,7 +37,7 @@
Group:System
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 20060302
+Release: 20060311
# list of sources
Source0:
http://ftp.gnome.org/pub/GNOME/sources/libgsf/%{V_major}/libgsf-%{version}.tar.bz2
@@ -45,7 +45,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: OpenPKG, openpkg = 20040130, perl, perl-xml
PreReq: OpenPKG, openpkg = 20040130
BuildPreReq: glib2, libxml, zlib, bzip2
PreReq: glib2, libxml, zlib, bzip2
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ldapdiff/ ldapdiff.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 09:32:56
Branch: HEAD Handle: 2006031108325500
Modified files:
openpkg-src/ldapdiffldapdiff.spec
Log:
strcasestr is not portable. Add a local copy.
Summary:
RevisionChanges Path
1.16+3 -1 openpkg-src/ldapdiff/ldapdiff.spec
patch -p0 '@@ .'
Index: openpkg-src/ldapdiff/ldapdiff.spec
$ cvs diff -u -r1.15 -r1.16 ldapdiff.spec
--- openpkg-src/ldapdiff/ldapdiff.spec1 Jan 2006 13:15:29 -
1.15
+++ openpkg-src/ldapdiff/ldapdiff.spec11 Mar 2006 08:32:55 -
1.16
@@ -33,10 +33,11 @@
Group:Database
License: GPL
Version: 1.2.1
-Release: 20051119
+Release: 20060311
# list of sources
Source0: http://webtomware.rhoen.de/ldapdiff-%{version}.tar.gz
+Patch0: ldapdiff.patch
# build information
Prefix: %{l_prefix}
@@ -62,6 +63,7 @@
%prep
%setup -q
+%patch -p0
%build
CC=%{l_cc} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ldapdiff/ ldapdiff.patch
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 09:33:41
Branch: HEAD Handle: 2006031108334100
Added files:
openpkg-src/ldapdiffldapdiff.patch
Log:
add patch to CVS, too
Summary:
RevisionChanges Path
1.1 +40 -0 openpkg-src/ldapdiff/ldapdiff.patch
patch -p0 '@@ .'
Index: openpkg-src/ldapdiff/ldapdiff.patch
$ cvs diff -u -r0 -r1.1 ldapdiff.patch
--- /dev/null 2006-03-11 09:33:41 +0100
+++ ldapdiff.patch2006-03-11 09:33:41 +0100
@@ -0,0 +1,40 @@
+Index: ldapmisc.c
+--- ldapmisc.c.orig 2005-11-18 22:17:27.0 +0100
ldapmisc.c 2006-03-11 09:28:02.345677747 +0100
+@@ -29,6 +29,27 @@
+
+ #include ldapdiff.h
+
++static char *
++my_strcasestr(s, find)
++const char *s, *find;
++{
++char c, sc;
++size_t len;
++
++if ((c = *find++) != 0) {
++c = tolower((unsigned char)c);
++len = strlen(find);
++do {
++do {
++if ((sc = *s++) == 0)
++return (NULL);
++} while ((char)tolower((unsigned char)sc) != c);
++} while (strncasecmp(s, find, len) != 0);
++s--;
++}
++return ((char *)s);
++}
++
+ int ldifcheckbase(char *attrbase)
+ {
+ char *confbase;
+@@ -36,7 +57,7 @@
+
+ confbase = ldifgetpconf(CONFBASEDN);
+
+- if((pos = strcasestr(attrbase,confbase)) == NULL){
++ if((pos = my_strcasestr(attrbase,confbase)) == NULL){
+ return -1;
+ }
+
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mysql/ mysql.patch mysql.spec rc.mysql
,
-Index: libmysql/Makefile.in
libmysql/Makefile.in.orig2005-10-10 00:47:20 +0200
-+++ libmysql/Makefile.in 2005-11-10 12:13:57 +0100
-@@ -213,6 +213,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_CHARSET_HOME=\$(MYSQLBASEdir)\ \
-+-DETCDIR=\$(MYSQLETCdir)\ \
- -DDATADIR=\$(MYSQLDATAdir)\ \
- -DSHAREDIR=\$(MYSQLSHAREdir)\ $(target_defs)
-
-@@ -420,6 +421,7 @@
- INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
-
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: libmysql_r/Makefile.in
libmysql_r/Makefile.in.orig 2005-10-10 00:47:20 +0200
-+++ libmysql_r/Makefile.in 2005-11-10 12:14:34 +0100
-@@ -211,6 +211,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_CHARSET_HOME=\$(MYSQLBASEdir)\ \
-+-DETCDIR=\$(MYSQLETCdir)\ \
- -DDATADIR=\$(MYSQLDATAdir)\ \
- -DSHAREDIR=\$(MYSQLSHAREdir)\ $(target_defs)
-
-@@ -419,6 +420,7 @@
- -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
-
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: bdb/mutex/mut_fcntl.c
bdb/mutex/mut_fcntl.c.orig 2005-10-10 00:46:27 +0200
-+++ bdb/mutex/mut_fcntl.c2005-11-11 13:44:07 +0100
-@@ -101,7 +101,7 @@
-
- /* Acquire an exclusive kernel lock. */
- k_lock.l_type = F_WRLCK;
--if (fcntl(dbenv-lockfhp-fd, F_SETLKW, k_lock))
-+if (fcntl(dbenv-lockfhp-fd, F_SETLKW, k_lock) == -1)
- return (__os_get_errno());
-
- /* If the resource is still available, it's ours. */
-@@ -112,7 +112,7 @@
-
- /* Release the kernel lock. */
- k_lock.l_type = F_UNLCK;
--if (fcntl(dbenv-lockfhp-fd, F_SETLK, k_lock))
-+if (fcntl(dbenv-lockfhp-fd, F_SETLK, k_lock) == -1)
- return (__os_get_errno());
-
- /*
-Index: bdb/os/os_open.c
bdb/os/os_open.c.orig2005-10-10 00:46:27 +0200
-+++ bdb/os/os_open.c 2005-11-11 13:44:07 +0100
-@@ -93,7 +93,7 @@
- if (LF_ISSET(DB_OSO_TRUNC))
- oflags |= O_TRUNC;
-
--#ifdef HAVE_O_DIRECT
-+#if defined(HAVE_O_DIRECT) defined(__FreeBSD__)
- if (LF_ISSET(DB_OSO_DIRECT))
- oflags |= O_DIRECT;
- #endif
+INSERT INTO user VALUES
('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
@@ .
patch -p0 '@@ .'
Index: openpkg-src/mysql/mysql.spec
$ cvs diff -u -r1.139 -r1.140 mysql.spec
--- openpkg-src/mysql/mysql.spec 8 Feb 2006 07:29:32 - 1.139
+++ openpkg-src/mysql/mysql.spec 11 Mar 2006 12:20:57 - 1.140
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 4.1
-%define V_minor 18
+%define V_major 5.0
+%define V_minor 19
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg%{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group:Database
License: GPL
Version: %{V_opkg}
-Release: 20060208
+Release: 20060311
# package options
%option with_serveryes
@@ -90,6 +90,10 @@
%patch -p0
%build
+# patch file search path
+%{l_shtool} subst %{l_value -s -a} \
+mysys/default.c
+
# determine additional configure options
case %{l_platform -t} in
*-freebsd* ) opt=--with-client-ldflags=-static
--with-mysqld-ldflags=-static ;;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/mysql/rc.mysql
$ cvs diff -u -r1.26 -r1.27 rc.mysql
--- openpkg-src/mysql/rc.mysql21 Jul 2005 19:42:24 - 1.26
+++ openpkg-src/mysql/rc.mysql11 Mar 2006 12:20:57 - 1.27
@@ -29,7 +29,7 @@
[EMAIL PROTECTED]@/var/mysql/common.log
[EMAIL PROTECTED]@/var/mysql/update.log
-%status -u @l_susr@ -o
+%status -u @l_rusr@ -o
mysql_usable=unknown
mysql_active=no
@l_prefix@/bin/mysqladmin \
@@ -49,7 +49,7 @@
@l_prefix@/bin/mysqld_safe /dev/null 21 \
[EMAIL PROTECTED]@ \
--pid-file=$mysql_pid_file \
---err-log=$mysql_err_log
+--log-error=$mysql_err_log
%stop -p 600 -u @l_susr@
rcService mysql enable
[CVS] OpenPKG: openpkg-src/mysql5/ my.cnf my.pwd mysql5.patch mysql5.s...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Mar-2006 13:21:39 Branch: HEAD Handle: 2006031112213800 Removed files: openpkg-src/mysql5 my.cnf my.pwd mysql5.patch mysql5.spec rc.mysql Log: remove obsolete package Summary: RevisionChanges Path 1.2 +0 -89 openpkg-src/mysql5/my.cnf 1.2 +0 -8 openpkg-src/mysql5/my.pwd 1.6 +0 -97 openpkg-src/mysql5/mysql5.patch 1.18+0 -295openpkg-src/mysql5/mysql5.spec 1.2 +0 -95 openpkg-src/mysql5/rc.mysql rm -f openpkg-src/mysql5/my.cnf '@@ .' Index: openpkg-src/mysql5/my.cnf [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/mysql5/my.pwd '@@ .' Index: openpkg-src/mysql5/my.pwd [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/mysql5/mysql5.patch '@@ .' Index: openpkg-src/mysql5/mysql5.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/mysql5/mysql5.spec '@@ .' Index: openpkg-src/mysql5/mysql5.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/mysql5/rc.mysql '@@ .' Index: openpkg-src/mysql5/rc.mysql [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mono/ mono.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 13:34:26
Branch: HEAD Handle: 2006031112342600
Modified files:
openpkg-src/monomono.spec
Log:
requires GNU bison and adjust substitution to again apply correctly
Summary:
RevisionChanges Path
1.28+3 -3 openpkg-src/mono/mono.spec
patch -p0 '@@ .'
Index: openpkg-src/mono/mono.spec
$ cvs diff -u -r1.27 -r1.28 mono.spec
--- openpkg-src/mono/mono.spec2 Mar 2006 07:58:35 - 1.27
+++ openpkg-src/mono/mono.spec11 Mar 2006 12:34:26 - 1.28
@@ -37,7 +37,7 @@
Group:Language
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20060302
+Release: 20060311
# list of sources
Source0:
http://go-mono.com/sources/mono-%{V_major}/mono-%{version}.tar.gz
@@ -46,7 +46,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, pkgconfig, perl
+BuildPreReq: OpenPKG, openpkg = 20040130, pkgconfig, perl, bison
PreReq: OpenPKG, openpkg = 20040130
BuildPreReq: glib2, glib2::with_threads = yes
PreReq: glib2, glib2::with_threads = yes
@@ -83,7 +83,7 @@
echo ac_cv_lib_sunmath_aintl=no
) config.cache
%{l_shtool} subst \
--e 's;trunc(0\.0);notexisting();' \
+-e 's/trunc;/notexisting;/' \
configure
# configure program
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/sqlite/ sqlite.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 13:39:48
Branch: HEAD Handle: 2006031112394800
Modified files:
openpkg-src/sqlite sqlite.spec
Log:
fix installation of SQLite 2.x and this way many dependend packages
Summary:
RevisionChanges Path
1.110 +2 -1 openpkg-src/sqlite/sqlite.spec
patch -p0 '@@ .'
Index: openpkg-src/sqlite/sqlite.spec
$ cvs diff -u -r1.109 -r1.110 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec11 Feb 2006 08:25:03 - 1.109
+++ openpkg-src/sqlite/sqlite.spec11 Mar 2006 12:39:48 - 1.110
@@ -37,7 +37,7 @@
Group:Database
License: PD
Version: %{V_v3}
-Release: 20060211
+Release: 20060311
# package options
%option with_v2 yes
@@ -97,6 +97,7 @@
%if %{with_v2} == yes
%patch -p0 -d sqlite-%{V_v2} -P 1
%endif
+chmod a+x sqlite-%{V_v2}/install-sh
for v in %{V_v3} \
%if %{with_v2} == yes
%{V_v2} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/p7zip/ p7zip.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 13:43:19
Branch: HEAD Handle: 2006031112431900
Modified files:
openpkg-src/p7zip p7zip.spec
Log:
requires gcc
Summary:
RevisionChanges Path
1.16+2 -2 openpkg-src/p7zip/p7zip.spec
patch -p0 '@@ .'
Index: openpkg-src/p7zip/p7zip.spec
$ cvs diff -u -r1.15 -r1.16 p7zip.spec
--- openpkg-src/p7zip/p7zip.spec 11 Feb 2006 08:26:44 - 1.15
+++ openpkg-src/p7zip/p7zip.spec 11 Mar 2006 12:43:19 - 1.16
@@ -33,7 +33,7 @@
Group:Archiver
License: LGPL
Version: 4.33
-Release: 20060211
+Release: 20060311
# list of sources
Source0:
http://osdn.dl.sourceforge.net/p7zip/p7zip_%{version}_src_all.tar.bz2
@@ -42,7 +42,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: OpenPKG, openpkg = 20040130, gcc
PreReq: OpenPKG, openpkg = 20040130
AutoReq: no
AutoReqProv: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/coreutils/ coreutils.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 13:47:58
Branch: HEAD Handle: 2006031112475700
Modified files:
openpkg-src/coreutils coreutils.spec
Log:
requires GCC as it contains some C99 features like 'restrict'
Summary:
RevisionChanges Path
1.51+2 -2 openpkg-src/coreutils/coreutils.spec
patch -p0 '@@ .'
Index: openpkg-src/coreutils/coreutils.spec
$ cvs diff -u -r1.50 -r1.51 coreutils.spec
--- openpkg-src/coreutils/coreutils.spec 10 Mar 2006 09:24:17 -
1.50
+++ openpkg-src/coreutils/coreutils.spec 11 Mar 2006 12:47:57 -
1.51
@@ -33,7 +33,7 @@
Group:Utility
License: GPL
Version: 5.93
-Release: 20060310
+Release: 20060311
# package options
%option with_legacy no
@@ -45,7 +45,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, make, perl
+BuildPreReq: OpenPKG, openpkg = 20040130, make, gcc, perl
PreReq: OpenPKG, openpkg = 20040130
AutoReq: no
AutoReqProv: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-dbix/ perl-dbix.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 13:51:02
Branch: HEAD Handle: 2006031112510200
Modified files:
openpkg-src/perl-dbix perl-dbix.spec
Log:
I'm 95% sure some of the DBIx modules need a more recent CPAN module
for the Module::AutoInstall stuff
Summary:
RevisionChanges Path
1.107 +2 -2 openpkg-src/perl-dbix/perl-dbix.spec
patch -p0 '@@ .'
Index: openpkg-src/perl-dbix/perl-dbix.spec
$ cvs diff -u -r1.106 -r1.107 perl-dbix.spec
--- openpkg-src/perl-dbix/perl-dbix.spec 11 Mar 2006 07:56:24 -
1.106
+++ openpkg-src/perl-dbix/perl-dbix.spec 11 Mar 2006 12:51:02 -
1.107
@@ -80,8 +80,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20040130, perl = %{V_perl}, perl-openpkg
= %{V_perl}-20040126
PreReq: OpenPKG, openpkg = 20040130, perl = %{V_perl}
-BuildPreReq: perl-dbi, perl-util, perl-sys, perl-cache, perl-devel
-PreReq: perl-dbi, perl-util, perl-sys, perl-cache, perl-devel
+BuildPreReq: perl-module, perl-dbi, perl-util, perl-sys, perl-cache,
perl-devel
+PreReq: perl-module, perl-dbi, perl-util, perl-sys, perl-cache,
perl-devel
AutoReq: no
AutoReqProv: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mysql51/ my.cnf my.pwd mysql51.patch mysql5...
/mysql51.spec
$ cvs diff -u -r0 -r1.1 mysql51.spec
--- /dev/null 2006-03-11 13:59:06 +0100
+++ mysql51.spec 2006-03-11 13:59:13 +0100
@@ -0,0 +1,311 @@
+##
+## mysql51.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. http://openpkg.net/
+## Copyright (c) 2000-2006 Ralf S. Engelschall http://engelschall.com/
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package version
+%define V_major 5.1
+%define V_minor 7
+%define V_mysql %{V_major}.%{V_minor}-beta
+%define V_opkg%{V_major}.%{V_minor}
+
+# package information
+Name: mysql51
+Summary: Fast Relational Database Management System
+URL: http://www.mysql.com/products/mysql/
+Vendor: MySQL AB
+Packager: OpenPKG
+Distribution: OpenPKG
+Class:EVAL
+Group:Database
+License: GPL
+Version: %{V_opkg}
+Release: 20060311
+
+# package options
+%option with_serveryes
+%option with_bdb yes
+%option with_innodbno
+%option with_ssl no
+%option with_ndb no
+%option with_embedded no
+
+# list of sources
+Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
+Source1: my.cnf
+Source2: my.pwd
+Source3: rc.mysql
+Patch0: mysql51.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg = 20040130, perl, gcc, make
+PreReq: OpenPKG, openpkg = 20040130, perl
+BuildPreReq: zlib, readline, ncurses
+PreReq: zlib, readline, ncurses
+%if %{with_ssl} == yes
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+AutoReq: no
+AutoReqProv: no
+Provides: mysql = %{version}-%{release}
+
+%description
+MySQL is a multi-user Relational Database Management System (RDBMS),
+which is controlled through Structured Query Language (SQL) operating in
+full multi-threading mode. The main goals of MySQL are speed, robustness
+and ease of use. MySQL was originally developed because of the need for
+a SQL server that could handle very big databases with magnitude higher
+speed than what any database vendor could offer.
+
+%track
+prog mysql51 = {
+version = %{V_mysql}
+url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
+regex = mysql-(__VER__)\.tar\.gz
+}
+
+%prep
+%setup -q -n mysql-%{V_mysql}
+%patch -p0
+
+%build
+# patch file search path
+%{l_shtool} subst %{l_value -s -a} \
+mysys/default.c
+
+# determine additional configure options
+case %{l_platform -t} in
+*-freebsd* ) opt=--with-client-ldflags=-static
--with-mysqld-ldflags=-static ;;
+*-linux* ) opt=--with-client-ldflags=-static
--with-mysqld-ldflags=-static ;;
+*-sunos* ) opt=--with-client-ldflags=-static
--with-mysqld-ldflags=-static ;;
+esac
+
+# configure source tree
+CC=%{l_cc} \
+CXX=%{l_cxx} \
+CFLAGS=%{l_cflags -O} \
+CXXFLAGS=%{l_cxxflags -O} \
+CPPFLAGS=%{l_cppflags ncurses} \
+LDFLAGS=-L`pwd`/bdb/build_unix -L`pwd`/libmysql %{l_ldflags} \
+./configure \
+--prefix=%{l_prefix} \
+--sysconfdir=%{l_prefix}/etc/mysql \
+--localstatedir=%{l_prefix}/var/mysql \
+--libexecdir=%{l_prefix}/libexec/mysql \
+--with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
+--with-mysqld-user=%{l_musr} \
+--enable-thread-safe-client \
+--with-comment=%{l_openpkg_release} \
+%if %{with_server} != yes
+--without-server \
+%endif
[CVS] OpenPKG: openpkg-src/pureftpd/ pureftpd.patch pureftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 14:00:14
Branch: HEAD Handle: 2006031113001000
Added files:
openpkg-src/pureftpdpureftpd.patch
Modified files:
openpkg-src/pureftpdpureftpd.spec
Log:
fix source code syntax
Summary:
RevisionChanges Path
1.1 +11 -0 openpkg-src/pureftpd/pureftpd.patch
1.74+3 -1 openpkg-src/pureftpd/pureftpd.spec
patch -p0 '@@ .'
Index: openpkg-src/pureftpd/pureftpd.patch
$ cvs diff -u -r0 -r1.1 pureftpd.patch
--- /dev/null 2006-03-11 14:00:04 +0100
+++ pureftpd.patch2006-03-11 14:00:13 +0100
@@ -0,0 +1,11 @@
+Index: src/bsd-getopt_long.c
+--- src/bsd-getopt_long.c.orig 2006-02-15 19:35:21.0 +0100
src/bsd-getopt_long.c2006-03-11 13:58:04.840806113 +0100
+@@ -474,6 +474,7 @@
+ *nargv[pure_optind + 1] != '-') {
+ pure_optarg = nargv[++pure_optind];
+ }
++}
+ }
+ pure_place = EMSG;
+ ++pure_optind;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/pureftpd/pureftpd.spec
$ cvs diff -u -r1.73 -r1.74 pureftpd.spec
--- openpkg-src/pureftpd/pureftpd.spec8 Mar 2006 20:59:53 -
1.73
+++ openpkg-src/pureftpd/pureftpd.spec11 Mar 2006 13:00:10 -
1.74
@@ -33,7 +33,7 @@
Group:FTP
License: GPL
Version: 1.0.21
-Release: 20060308
+Release: 20060311
# package options
%option with_fslyes
@@ -48,6 +48,7 @@
Source0:
ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.gz
Source1: rc.pureftpd
Source2: fsl.pureftpd
+Patch0: pureftpd.patch
# build information
Prefix: %{l_prefix}
@@ -97,6 +98,7 @@
%prep
%setup -q -n pure-ftpd-%{version}
+%patch -p0
%build
CC=%{l_cc} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-meta/ canvas-nav-bar.php
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-meta Date: 11-Mar-2006 14:08:18
Branch: HEAD Handle: 2006031113081700
Modified files:
openpkg-metacanvas-nav-bar.php
Log:
fix navigation bar dynamic processing
Summary:
RevisionChanges Path
1.9 +19 -17 openpkg-meta/canvas-nav-bar.php
patch -p0 '@@ .'
Index: openpkg-meta/canvas-nav-bar.php
$ cvs diff -u -r1.8 -r1.9 canvas-nav-bar.php
--- openpkg-meta/canvas-nav-bar.php 9 Mar 2006 19:12:10 - 1.8
+++ openpkg-meta/canvas-nav-bar.php 11 Mar 2006 13:08:17 - 1.9
@@ -89,21 +89,12 @@
}
$html = implode(\n, $html);
$html = preg_replace(/(li id=\navbar.$path\)/s, $1
class=\active\, $html);
- #$html = preg_replace(/(li id=\(.+?)\[^]*a)/s, $1
onMouseOver=\navbar_over('$2'); return true;\ onMouseOut=\navbar_out('$2');
return true;\, $html);
divert(canvas-nav);
echo div class=\navbar\ id=\navbar\\n;
echo $html;
echo /div\n;
/script
-script type=text/javascript
-var nodes = DOM.getNode(DIV.navbar LI);
-for (var i = 0; i nodes.length; i++) {
-DOM.setEvent(nodes[i], mouseover, navbar_over, nodes[i].id, true); /*
navbar_over('+nodes[i].id+'); return true;); */
-DOM.setEvent(nodes[i], mouseout, navbar_out, nodes[i].id, true); /*
('+nodes[i].id+'); return true;); */
-}
-/script
-
script language=php
divert(js);
/script
@@ -133,19 +124,19 @@
var navbar_default = script language=phpecho navbar..$path/script;
var navbar_active = navbar_default;
-function navbar_over (id) {
-/* var el = document.getElementById(id).getElementsByTagName('a')[0]; */
-var el = document.getElementById(this).getElementsByTagName('a')[0];
+function navbar_over (e) {
+var id = this;
+var el = document.getElementById(id).getElementsByTagName('a')[0];
window.status = el.href;
navbar_active = id;
defer_cancel(navbar_out);
defer_schedule(navbar_over, navbar_update();, 800);
}
-function navbar_out (id) {
+function navbar_out (e) {
+var id = this;
window.status = ;
-/* defer_schedule(navbar_out, navbar_out_stage2('+id+');, 4000); */
-defer_schedule(navbar_out, navbar_out_stage2('+this+');, 4000);
+defer_schedule(navbar_out, navbar_out_stage2('+id+');, 4000);
}
function navbar_out_stage2 (id) {
@@ -156,8 +147,6 @@
}
function navbar_update () {
-if (!document.getElementById)
-return;
var active_a = navbar_active.split(.);
active_a.pop();
var active_prefix = active_a.join(.);
@@ -180,3 +169,16 @@
return;
}
+/* DOM event activation */
+
+function nav_bar_setevents(e) {
+var nodes = DOM.getNode(DIV.navbar LI);
+for (var i = 0; i nodes.length; i++) {
+var anchor = DOM.getNode(A, nodes[i])[0];
+DOM.setEvent(anchor, mouseover, navbar_over, nodes[i].id, true);
+DOM.setEvent(anchor, mouseout, navbar_out, nodes[i].id, true);
+}
+}
+
+DOM.setEvent(window, load, nav_bar_setevents);
+
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-meta/ canvas-js.php canvas-layout.php canvas-na...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-meta Date: 11-Mar-2006 17:33:00
Branch: HEAD Handle: 2006031116325900
Modified files:
openpkg-metacanvas-js.php canvas-layout.php canvas-nav-bar.php
canvas-nav-path.php canvas-nav-tab.php
canvas-nav-title.php canvas-style.php canvas.php
Log:
switch to global configuration array variables instead of a dozend
individual variables
Summary:
RevisionChanges Path
1.4 +5 -5 openpkg-meta/canvas-js.php
1.14+11 -11 openpkg-meta/canvas-layout.php
1.10+3 -3 openpkg-meta/canvas-nav-bar.php
1.5 +2 -2 openpkg-meta/canvas-nav-path.php
1.8 +4 -4 openpkg-meta/canvas-nav-tab.php
1.4 +2 -2 openpkg-meta/canvas-nav-title.php
1.9 +2 -2 openpkg-meta/canvas-style.php
1.16+54 -39 openpkg-meta/canvas.php
patch -p0 '@@ .'
Index: openpkg-meta/canvas-js.php
$ cvs diff -u -r1.3 -r1.4 canvas-js.php
--- openpkg-meta/canvas-js.php9 Mar 2006 20:50:31 - 1.3
+++ openpkg-meta/canvas-js.php11 Mar 2006 16:32:59 - 1.4
@@ -31,13 +31,13 @@
!-- Yahoo! UI DOM --
!-- see http://developer.yahoo.net/yui/dom/index.html for more details. --
-script src=?php echo $rooturl ?canvas-js-dhtml/yui/YAHOO.js
type=text/javascript/script
-script src=?php echo $rooturl ?canvas-js-dhtml/yui/event.js
type=text/javascript/script
-script src=?php echo $rooturl ?canvas-js-dhtml/yui/dom.js
type=text/javascript/script
+script src=?php echo $cfg[url.base] ?canvas-js-dhtml/yui/YAHOO.js
type=text/javascript/script
+script src=?php echo $cfg[url.base] ?canvas-js-dhtml/yui/event.js
type=text/javascript/script
+script src=?php echo $cfg[url.base] ?canvas-js-dhtml/yui/dom.js
type=text/javascript/script
!-- CSS-style DOM node selection --
!-- see http://dean.edwards.name/my/cssQuery/ for more details. --
-script src=?php echo $rooturl ?canvas-js-dhtml/cssquery/cssquery.js
type=text/javascript/script
+script src=?php echo $cfg[url.base]
?canvas-js-dhtml/cssquery/cssquery.js type=text/javascript/script
!-- create own convenience JavaScript object --
script type=text/javascript
@@ -71,6 +71,6 @@
!-- see http://dean.edwards.name/IE7/ for more details. --
!--[if lt IE 7]
script type=text/javascriptIE7_PNG_SUFFIX = -T.png;/script
-script src=?php echo $rooturl ?canvas-js-dhtml/ie7/ie7-standard-p.js
type=text/javascript/script
+script src=?php echo $cfg[url.base]
?canvas-js-dhtml/ie7/ie7-standard-p.js type=text/javascript/script
![endif]--
@@ .
patch -p0 '@@ .'
Index: openpkg-meta/canvas-layout.php
$ cvs diff -u -r1.13 -r1.14 canvas-layout.php
--- openpkg-meta/canvas-layout.php9 Mar 2006 21:10:32 - 1.13
+++ openpkg-meta/canvas-layout.php11 Mar 2006 16:32:59 - 1.14
@@ -35,7 +35,7 @@
margin:0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
background-color: #00;
-background-image: url('?php echo $rooturl
?canvas/canvas-crop-gradient.png');
+background-image: url('?php echo $cfg[url.base]
?canvas/canvas-crop-gradient.png');
background-position: left top;
background-repeat: repeat-x;
background-attachment: fixed;
@@ -46,7 +46,7 @@
DIV#canvas {
left: 0px;
right: 0px;
-script language=phpif ($stretch == margin) {/script
+script language=phpif ($opt[stretch] == margin) {/script
position: relative;
margin-left: auto;
margin-right: auto;
@@ -67,7 +67,7 @@
background-color: #ff;
background-repeat: no-repeat;
background-position: right top;
-background-image: url('?php echo $rooturl
?canvas/canvas-crop-background.jpg');
+background-image: url('?php echo $cfg[url.base]
?canvas/canvas-crop-background.jpg');
z-index: 1;
}
@@ -113,7 +113,7 @@
height:auto;
}
-script language=phpif ($pane == 1) {/script
+script language=phpif ($opt[pane] == 1) {/script
H1 {
top: 220px;
@@ -135,7 +135,7 @@
height:20px;
}
-script language=php} else
[CVS] OpenPKG: openpkg-meta/ canvas.php
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-meta Date: 11-Mar-2006 17:38:45
Branch: HEAD Handle: 2006031116384500
Modified files:
openpkg-metacanvas.php
Log:
align style and reduce more global variables
Summary:
RevisionChanges Path
1.17+17 -19 openpkg-meta/canvas.php
patch -p0 '@@ .'
Index: openpkg-meta/canvas.php
$ cvs diff -u -r1.16 -r1.17 canvas.php
--- openpkg-meta/canvas.php 11 Mar 2006 16:32:59 - 1.16
+++ openpkg-meta/canvas.php 11 Mar 2006 16:38:45 - 1.17
@@ -91,7 +91,7 @@
# determine last-modification and
# short circuit processing if HTTP If-Modified-Since applies
$gmtime = gmdate(D, d M Y H:i:s, filemtime($_SERVER[SCRIPT_FILENAME])) .
UTC;
-header(Last-Modified: $gmtime);
+header(sprintf(Last-Modified: %s, $gmtime));
$if_modified_since = preg_replace('/;.*$/', '', $hdr[If-Modified-Since]);
if ($if_modified_since == $gmtime) {
header(HTTP/1.1 304 Not Modified);
@@ -110,40 +110,38 @@
unset($spec);
# diversion support
-$diversion_name = ;
-$diversion_data = array();
+$div = array();
+$div[name] = ;
+$div[data] = array();
function divert_start ($name) {
-global $diversion_name;
-global $diversion_data;
-$diversion_name = $name;
-if (!isset($diversion_data[$diversion_name])) {
-$diversion_data[$diversion_name] = ;
+global $div;
+$div[name] = $name;
+if (!isset($div[data][$diversion_name])) {
+$div[data][$diversion_name] = ;
}
ob_start();
}
function divert_end () {
-global $diversion_name;
-global $diversion_data;
-if ($diversion_name != ) {
-$diversion_data[$diversion_name] .= ob_get_contents();
+global $div;
+if ($div[name] != ) {
+$div[data][$div[name]] .= ob_get_contents();
ob_end_clean();
}
}
function divert ($name) {
-global $diversion_name;
-if ($diversion_name != $name) {
+global $div;
+if ($div[name] != $name) {
divert_end();
divert_start($name);
}
}
function undivert ($name) {
-global $diversion_name;
-global $diversion_data;
-if ($diversion_name == $name) {
-$diversion_data[$diversion_name] .= ob_get_contents();
+global $div;
+if ($div[name] == $name) {
+$div[data][$div[name]] .= ob_get_contents();
ob_clean();
}
-return $diversion_data[$name];
+return $div[data][$name];
}
# load content generation parts
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
