date:20050204

[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh

2005-02-04 Thread Thomas Lotterer

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-toolsDate:   04-Feb-2005 14:59:06
  Branch: HEAD Handle: 2005020413590600

  Modified files:
openpkg-tools/cmd   dev.sh

  Log:
search whole PATH for suitable egrep(1) and awk(1); avoid problem when
egrep is given an empty argument

  Summary:
RevisionChanges Path
1.34+36 -27 openpkg-tools/cmd/dev.sh
  

  patch -p0 '@@ .'
  Index: openpkg-tools/cmd/dev.sh
  
  $ cvs diff -u -r1.33 -r1.34 dev.sh
  --- openpkg-tools/cmd/dev.sh  1 Jan 2005 11:17:38 -   1.33
  +++ openpkg-tools/cmd/dev.sh  4 Feb 2005 13:59:06 -   1.34
  @@ -82,16 +82,22 @@
   S=${S:-src} # chicken-egg hack FIXME
   
   #   use appropriate tools
  -if [ -x /usr/xpg4/bin/egrep ]; then
  -EGREP=/usr/xpg4/bin/egrep
  -else
  -EGREP=`type -f -p egrep`
  -fi
  -if [ -x /usr/xpg4/bin/awk ]; then
  -AWK=/usr/xpg4/bin/awk
  -else
  -AWK=`type -f -p awk`
  -fi
  +EGREP=
  +for i in `echo $PATH: | sed -e 's;:; ;g'` /usr/xpg4/bin; do
  +i=${i}/egrep
  +if [ -x $i -a .`echo foo | $i 2/dev/null '^f[nop]+$'` = .foo ]; then
  +EGREP=$i
  +break;
  +fi
  +done
  +AWK=
  +for i in `echo $PATH: | sed -e 's;:; ;g'` /usr/xpg4/bin; do
  +i=${i}/awk
  +if [ -x $i -a .`echo foo | $i 2/dev/null -v foo=bar '/foo/ { print foo 
}'` = .bar ]; then
  +AWK=$i
  +break;
  +fi
  +done
   
   #   a note about CVS HEAD
   #   CVS calls the latest version of a file head. It also supports two
  @@ -983,18 +989,21 @@
   echo ${INSTANCE} | ${EGREP} ^[0-9]+\.[0-9]{1,7}\.[0-9]+$ /dev/null 
 RE=^${INSTANCE}$  #SOLID
   RE=`echo ${RE} | sed -e 's;\.;\\.;g'`
   
  -for INSTANCE in ${OPENPKG_INST}; do
  -initmpx ${INSTANCE}
  -if [ .${RPMCMD} != . ]; then
  -VERSION=`${RPMCMD} -q --qf %{VERSION} openpkg`
  -echo ${VERSION} | ${EGREP} $RE /dev/null
  -if [ $? -eq 0 ]; then
  -RV=${INSTANCE}
  -unset INSTANCE
  -return
  +if [ .$RE != . ]; then
  +for INSTANCE in ${OPENPKG_INST}; do
  +initmpx ${INSTANCE}
  +if [ .${RPMCMD} != . ]; then
  +VERSION=`${RPMCMD} -q --qf %{VERSION} openpkg`
  +echo ${VERSION} | ${EGREP} $RE /dev/null
  +if [ $? -eq 0 ]; then
  +RV=${INSTANCE}
  +unset INSTANCE
  +return
  +fi
   fi
  -fi
  -done
  +done
  +fi
  +
   if [ .$mode = .any ]; then
   OPENPKG_INST=${OPENPKG_INST} `uwhich openpkg | sed -e 
's;/bin/openpkg$;;'`
   OPENPKG_INST=${OPENPKG_INST} `uwhich rpm | sed -e 's;/bin/rpm$;;'`
  @@ -2492,15 +2501,15 @@
   set -- help
   fi
   
  -#   check whether EGREP really supports regular expressions
  -if [ ! .`echo foo | ${EGREP} '^f[nop]+$'` = .foo ]; then
  -error $0:ERROR: found ${EGREP} but it doesn't support regular 
expressions
  +#   check whether EGREP was found
  +if [ .${EGREP} = . ]; then
  +error $0:ERROR: no egrep(1) found that really supports required regular 
expressions
   exit 1
   fi
   
  -#   check whether AWK supports -v var=val option
  -if [ ! .`echo foo | ${AWK} -v foo=bar '/foo/ { print foo }'` = .bar ]; then
  -error $0:ERROR: found ${AWK} but it doesn't support -v var=val option
  +#   check whether AWK was found
  +if [ .${AWK} = . ]; then
  +error $0:ERROR: no awk(1) found that supports the required \-v 
var=val\ option
   exit 1
   fi
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-tools/cmd/ bf-mk.pl src2make.pl

2005-02-04 Thread Thomas Lotterer

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-toolsDate:   04-Feb-2005 15:11:25
  Branch: HEAD Handle: 2005020414112500

  Modified files:
openpkg-tools/cmd   bf-mk.pl src2make.pl

  Log:
allow specification of rpm(8) and rpm2cpio(8) for MASTER through
config file and set appropriate default

  Summary:
RevisionChanges Path
1.13+2  -0  openpkg-tools/cmd/bf-mk.pl
1.9 +16 -15 openpkg-tools/cmd/src2make.pl
  

  patch -p0 '@@ .'
  Index: openpkg-tools/cmd/bf-mk.pl
  
  $ cvs diff -u -r1.12 -r1.13 bf-mk.pl
  --- openpkg-tools/cmd/bf-mk.pl4 Feb 2005 09:40:08 -   1.12
  +++ openpkg-tools/cmd/bf-mk.pl4 Feb 2005 14:11:25 -   1.13
  @@ -725,6 +725,8 @@
   shtool  %{openpkg} shtool;
   src2make%{openpkg} src2make;
   rpm %{openpkg} rpm;
  +rpm2cpio%{openpkg} rpm2cpio;
  +cpiocpio;
   bfmk%{openpkg} bf-mk;
   bfui%{openpkg} bf-ui;
   bfdb%{openpkg} bf-db;
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-tools/cmd/src2make.pl
  
  $ cvs diff -u -r1.8 -r1.9 src2make.pl
  --- openpkg-tools/cmd/src2make.pl 2 Feb 2005 21:03:14 -   1.8
  +++ openpkg-tools/cmd/src2make.pl 4 Feb 2005 14:11:25 -   1.9
  @@ -138,27 +138,28 @@
  -C|--config=FILE   specifiy config file ($config)\n;
   exit(0);
   }
  +
  +#   handle config
  +my $cfg = readconfig($config);
  +my $dbfile  = $cfg-{master}-{dbfile}  || die mandatory 
setting master.dbfile undefined;
  +my $lockretries = $cfg-{master}-{lockretries} || 250;
  +my $rpm = $cfg-{master}-{rpm} || $prefix/bin/openpkg 
rpm;
  +my $rpm2cpio= $cfg-{master}-{rpm2cpio}|| $prefix/bin/openpkg 
rpm2cpio;
  +my $cpio= $cfg-{master}-{cpio}|| cpio;
  +
  +$rpm =  fullpath($rpm)  unless ($rpm  =~ m|/|);
  +$rpm2cpio = fullpath($rpm2cpio) unless ($rpm2cpio =~ m|/|);
  +$cpio = fullpath($cpio) unless ($cpio =~ m|/|);
  +
   $outdir = $srcdir if ($outdir eq '');
   if ($prefix eq '' or $srcdir eq '') {
   die at least --prefix and --srcdir have to be specified;
   }
  -if (not (-x $prefix/bin/openpkg and -x $prefix/libexec/openpkg/rpm and 
-x $prefix/libexec/openpkg/rpm2cpio)) {
  -die programs 'rpm' and 'rpm2cpio' not found under OpenPKG hierarchy 
'$prefix';
  -}
  -my $cpio;
  -if (($cpio = fullpath(cpio)) eq '') {
  -die program 'cpio' not found in PATH;
  -}
   if (not -d $tmpdir) {
   mkdir($tmpdir, 0700) || die cannot create temporary directory 
'$tmpdir';
   cleanup_remember(rm -rf $tmpdir);
   }
   
  -#   handle config
  -my $cfg = readconfig($config);
  -my $dbfile  = $cfg-{master}-{dbfile}  || die mandatory 
setting master.dbfile undefined;
  -my $lockretries = $cfg-{master}-{lockretries} || 250;
  -
   #   open and initialize database
   my $dbh = dbinit($dbfile);
   
  @@ -214,7 +215,7 @@
   $q .= S-$t:%{$t}\n;
   }
   $q .= [M-BuildPreReq:%{REQUIRENAME} 
%|REQUIREFLAGS?{%{REQUIREFLAGS:depflags} %{REQUIREVERSION}}:{}|\n];
  -my $o = `$prefix/bin/openpkg rpm -qp --qf $q $srcdir/$srcrpm 
2/dev/null`;
  +my $o = `$rpm -qp --qf $q $srcdir/$srcrpm 2/dev/null`;
   $o =~ s|M-BuildPreReq:rpmlib\(.*?\).*?\n||gs;
   my $r = parseresponse($o);
   my $pkg_name = $r-{Name};
  @@ -285,7 +286,7 @@
   verbose(sprintf cache dirty (md5 mismatch): discard whole cache 
content, read original source and cache it);
   system(rm -rf $tmpdir/$srcrpm_name /dev/null 21 || true);
   mkdir($tmpdir/$srcrpm_name, 0755) || die cannot create temporary 
directory '$tmpdir/$srcrpm_name';
  -runcmd($prefix/bin/openpkg rpm2cpio $srcdir/$srcrpm | (cd 
$tmpdir/$srcrpm_name  $cpio -idvmu $srcrpm_name.spec $srcrpm_name.sh 
/dev/null 21));
  +runcmd($rpm2cpio $srcdir/$srcrpm | (cd $tmpdir/$srcrpm_name  
$cpio -idvmu $srcrpm_name.spec $srcrpm_name.sh /dev/null 21));
   if (not -f $tmpdir/$srcrpm_name/$srcrpm_name.spec) {
   print STDERR $progname: failed to extract '$srcrpm_name.spec' 
from '$srcdir/$srcrpm' - skipping\n;
   next SRCRPM;
  @@ -297,7 +298,7 @@
   $o = cacheread($tmpdir/$srcrpm_name/o);
   if ($o eq ) {
   verbose(sprintf cache dirty (o not cached): execute original query 
and cache it);
  -$o = `cd $tmpdir/$srcrpm_name  $prefix/bin/openpkg rpm -q --qf 
$q --define

[CVS] OpenPKG: openpkg-src/postfix/ etc.tar postfix.spec

2005-02-04 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 16:54:04
  Branch: HEAD Handle: 2005020415540300

  Modified files:
openpkg-src/postfix etc.tar postfix.spec

  Log:
the nqmgr is already the default (the old one is installed as oqmgr),
but do no longer confuse people and just use qmgr/nqmgr only

  Summary:
RevisionChanges Path
1.20BLOBopenpkg-src/postfix/etc.tar
1.215   +1  -1  openpkg-src/postfix/postfix.spec
  

  (cd openpkg-src/postfix  \
   uudecode '@@ .'  \
   mv etc.tar etc.tar.orig  \
   xdelta patch etc.tar.xdelta etc.tar.orig etc.tar  \
   rm -f etc.tar.orig etc.tar.xdelta)
  Index: openpkg-src/postfix/etc.tar
  
  begin 664 etc.tar.xdelta
  M)5A$6C`P-4(`!``$`!S:EE;$N-S,U-S,N
  M;VQDVAI96QA+CS-3S+FYE=Q^+`,#'XL(
  M`V-@:!F8`PN+;[.?81/+RP;.[EMAIL PROTECTED]/#\OQP```!4
  ()5A$6C`P-4`
  `
  end
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/postfix/postfix.spec
  
  $ cvs diff -u -r1.214 -r1.215 postfix.spec
  --- openpkg-src/postfix/postfix.spec  1 Jan 2005 10:53:59 -   1.214
  +++ openpkg-src/postfix/postfix.spec  4 Feb 2005 15:54:03 -   1.215
  @@ -42,7 +42,7 @@
   Group:Mail
   License:  IPL
   Version:  %{V_postfix}
  -Release:  20041217
  +Release:  20050204
   
   #   package options
   %option   with_fsl   yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/png/ png.spec

2005-02-04 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 18:50:58
  Branch: HEAD Handle: 2005020417505700

  Modified files:
openpkg-src/png png.spec

  Log:
install pkgconfig file for libpng (required by forthcoming cairo
package)

  Summary:
RevisionChanges Path
1.42+14 -3  openpkg-src/png/png.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/png/png.spec
  
  $ cvs diff -u -r1.41 -r1.42 png.spec
  --- openpkg-src/png/png.spec  1 Jan 2005 10:53:57 -   1.41
  +++ openpkg-src/png/png.spec  4 Feb 2005 17:50:57 -   1.42
  @@ -34,7 +34,7 @@
   Group:Graphics
   License:  BSD
   Version:  1.2.8
  -Release:  20041203
  +Release:  20050204
   
   #   list of sources
   Source0:  
http://osdn.dl.sourceforge.net/sourceforge/libpng/libpng-%{version}.tar.gz
  @@ -76,12 +76,23 @@
   
   %install
   rm -rf $RPM_BUILD_ROOT
  -%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
  +%{l_shtool} mkdir -f -p -m 755 \
  +$RPM_BUILD_ROOT%{l_prefix} \
  +$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
   %{l_make} %{l_mflags} \
   -f scripts/makefile.std \
   prefix=$RPM_BUILD_ROOT%{l_prefix} \
   install
  -%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +%{l_shtool} install -c -m 644 \
  +-e 's;@PREFIX@;%{l_prefix};g' \
  +-e 's;libpng12;libpng;g' \
  +-e 's;-lpng12;-lpng;g' \
  +-e 's;/libpng12;;g' \
  +scripts/libpng.pc.in \
  +$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/libpng.pc
  +%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +%{l_files_std} \
  +'%not %dir %{l_prefix}/lib/pkgconfig'
   
   %files -f files
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/libpixman/ libpixman.spec

2005-02-04 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 18:51:25
  Branch: HEAD Handle: 2005020417512400

  Added files:
openpkg-src/libpixman   libpixman.spec

  Log:
new package: libpixman 0.1.3 (Cairo Pixel Manipulation Library)

  Summary:
RevisionChanges Path
1.1 +85 -0  openpkg-src/libpixman/libpixman.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/libpixman/libpixman.spec
  
  $ cvs diff -u -r0 -r1.1 libpixman.spec
  --- /dev/null 2005-02-04 18:51:24 +0100
  +++ libpixman.spec2005-02-04 18:51:25 +0100
  @@ -0,0 +1,85 @@
  +##
  +##  libpixman.spec -- OpenPKG RPM Specification
  +##  Copyright (c) 2000-2005 The OpenPKG Project http://www.openpkg.org/
  +##  Copyright (c) 2000-2005 Ralf S. Engelschall [EMAIL PROTECTED]
  +##  Copyright (c) 2000-2005 Cable  Wireless http://www.cw.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 information
  +Name: libpixman
  +Summary:  Cairo Pixel Manipulation Library
  +URL:  http://cairographics.org/
  +Vendor:   The Cairo Project
  +Packager: The OpenPKG Project
  +Distribution: OpenPKG
  +Class:EVAL
  +Group:XWindow
  +License:  MIT-style
  +Version:  0.1.3
  +Release:  20050204
  +
  +#   list of sources
  +Source0:  http://cairographics.org/snapshots/libpixman-%{version}.tar.gz
  +
  +#   build information
  +Prefix:   %{l_prefix}
  +BuildRoot:%{l_buildroot}
  +BuildPreReq:  OpenPKG, openpkg = 20040130
  +PreReq:   OpenPKG, openpkg = 20040130
  +AutoReq:  no
  +AutoReqProv:  no
  +
  +%description
  +Libpixman is the pixel manipulation library of the Cairo project.
  +It provides pixel region and image compositing APIs.
  +
  +%track
  +prog libpixman = {
  +version   = %{version}
  +url   = http://cairographics.org/snapshots/
  +regex = libpixman-(__VER__)\.tar\.gz
  +}
  +
  +%prep
  +%setup -q
  +
  +%build
  +CC=%{l_cc} \
  +CFLAGS=%{l_cflags -O} \
  +CPPFLAGS=%{l_cppflags} \
  +LDFLAGS=%{l_ldflags} \
  +./configure \
  +--prefix=%{l_prefix} \
  +--disable-shared
  +%{l_make} %{l_mflags -O}
  +
  +%install
  +rm -rf $RPM_BUILD_ROOT
  +%{l_make} %{l_mflags} install AM_MAKEFLAGS=DESTDIR=$RPM_BUILD_ROOT
  +%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +%{l_files_std} \
  +'%not %dir %{l_prefix}/lib/pkgconfig'
  +
  +%files -f files
  +
  +%clean
  +rm -rf $RPM_BUILD_ROOT
  +
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/cairo/ cairo.spec

2005-02-04 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 18:52:39
  Branch: HEAD Handle: 2005020417523900

  Added files:
openpkg-src/cairo   cairo.spec

  Log:
new package: cairo 0.3.0 (Cairo Vector Graphics Library)

  Summary:
RevisionChanges Path
1.1 +145 -0 openpkg-src/cairo/cairo.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/cairo/cairo.spec
  
  $ cvs diff -u -r0 -r1.1 cairo.spec
  --- /dev/null 2005-02-04 18:52:39 +0100
  +++ cairo.spec2005-02-04 18:52:39 +0100
  @@ -0,0 +1,145 @@
  +##
  +##  cairo.spec -- OpenPKG RPM Specification
  +##  Copyright (c) 2000-2005 The OpenPKG Project http://www.openpkg.org/
  +##  Copyright (c) 2000-2005 Ralf S. Engelschall [EMAIL PROTECTED]
  +##  Copyright (c) 2000-2005 Cable  Wireless http://www.cw.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 information
  +Name: cairo
  +Summary:  Cairo Vector Graphics Library
  +URL:  http://www.cairo.org/
  +Vendor:   Carl Worth  Keith Packard
  +Packager: The OpenPKG Project
  +Distribution: OpenPKG
  +Class:EVAL
  +Group:XWindow
  +License:  MIT-style
  +Version:  0.3.0
  +Release:  20050204
  +
  +#   package options
  +%option   with_pdf   yes
  +%option   with_psyes
  +%option   with_png   yes
  +%option   with_x11   no
  +
  +#   list of sources
  +Source0:  http://cairographics.org/snapshots/cairo-%{version}.tar.gz
  +
  +#   build information
  +Prefix:   %{l_prefix}
  +BuildRoot:%{l_buildroot}
  +BuildPreReq:  OpenPKG, openpkg = 20040130, pkgconfig
  +PreReq:   OpenPKG, openpkg = 20040130
  +BuildPreReq:  fontconfig, freetype, libpixman
  +PreReq:   fontconfig, freetype, libpixman
  +%if %{with_png} == yes
  +BuildPreReq:  png = 1.2.8-20050204, zlib
  +PreReq:   png = 1.2.8-20050204, zlib
  +%endif
  +%if %{with_ps} == yes
  +BuildPreReq:  zlib
  +PreReq:   zlib
  +%endif
  +%if %{with_x11} == yes
  +BuildPreReq:  x11, xrender
  +PreReq:   x11, xrender
  +%endif
  +AutoReq:  no
  +AutoReqProv:  no
  +
  +%description
  +Cairo is a vector graphics library designed to provide high-quality
  +display and print output. Currently supported output targets include
  +the X Window System, OpenGL, in-memory image buffers, and image
  +files (PNG and PostScript). Cairo is designed to produce identical
  +output on all output media while taking advantage of display
  +hardware acceleration when available. Cairo provides a stateful
  +user-level API with capabilities similar to the PDF 1.4 imaging
  +model. Cairo provides operations including stroking and filling
  +Bezier cubic splines, transforming and compositing translucent
  +images, and antialiased text rendering.
  +
  +%track
  +prog cairo = {
  +version   = %{version}
  +url   = http://cairographics.org/snapshots/
  +regex = cairo-(__VER__)\.tar\.gz
  +}
  +
  +%prep
  +%setup -q
  +
  +%build
  +%{l_shtool} subst \
  +-e 's;libpng12;libpng;g' \
  +configure
  +export CC=%{l_cc}
  +export CFLAGS=%{l_cflags -O}
  +export CPPFLAGS=%{l_cppflags}
  +export LDFLAGS=%{l_ldflags}
  +%if %{with_x11} == yes
  +CPPFLAGS=$CPPFLAGS -I`%{l_rc} --query x11_incdir`
  +LDFLAGS=$LDFLAGS -L`%{l_rc} --query x11_libdir`
  +%endif
  +./configure \
  +--prefix=%{l_prefix} \
  +%if %{with_png} == yes

[CVS] OpenPKG: openpkg-src/amd/ amd.patch amd.spec

2005-02-04 Thread Michael Schloh

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 23:29:49
  Branch: HEAD Handle: 2005020422294900

  Modified files:
openpkg-src/amd amd.patch amd.spec

  Log:
port to Solaris10 by hacking out the GROUP_OBJ conflicting definition

  Summary:
RevisionChanges Path
1.11+13 -0  openpkg-src/amd/amd.patch
1.62+1  -1  openpkg-src/amd/amd.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/amd/amd.patch
  
  $ cvs diff -u -r1.10 -r1.11 amd.patch
  --- openpkg-src/amd/amd.patch 21 Dec 2004 10:27:40 -  1.10
  +++ openpkg-src/amd/amd.patch 4 Feb 2005 22:29:49 -   1.11
  @@ -161,3 +161,16 @@

struct opt_map {
  const char *opt;  /* option name */
  +Index: include/am_defs.h
  +--- include/am_defs.h.orig   2005-02-04 23:22:22 +0100
   include/am_defs.h2005-02-04 23:22:23 +0100
  +@@ -908,6 +908,9 @@
  +  * Actions to take if rpcsvc/nis.h exists.
  +  */
  + #ifdef HAVE_RPCSVC_NIS_H
  ++#ifdef GROUP_OBJ
  ++#undef GROUP_OBJ
  ++#endif /* GROUP_OBJ */
  + # include rpcsvc/nis.h
  + #endif /* HAVE_RPCSVC_NIS_H */
  + 
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/amd/amd.spec
  
  $ cvs diff -u -r1.61 -r1.62 amd.spec
  --- openpkg-src/amd/amd.spec  1 Jan 2005 10:47:45 -   1.61
  +++ openpkg-src/amd/amd.spec  4 Feb 2005 22:29:49 -   1.62
  @@ -34,7 +34,7 @@
   Group:System
   License:  BSD
   Version:  6.0.9
  -Release:  20041221
  +Release:  20050204
   
   #   list of sources
   Source0:  ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/amd/ amd.patch

2005-02-04 Thread Michael Schloh

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 23:42:06
  Branch: HEAD Handle: 2005020422420600

  Modified files:
openpkg-src/amd amd.patch

  Log:
reduce recent GROUP_OBJ patch addition to one line

  Summary:
RevisionChanges Path
1.12+1  -3  openpkg-src/amd/amd.patch
  

  patch -p0 '@@ .'
  Index: openpkg-src/amd/amd.patch
  
  $ cvs diff -u -r1.11 -r1.12 amd.patch
  --- openpkg-src/amd/amd.patch 4 Feb 2005 22:29:49 -   1.11
  +++ openpkg-src/amd/amd.patch 4 Feb 2005 22:42:06 -   1.12
  @@ -164,13 +164,11 @@
   Index: include/am_defs.h
   --- include/am_defs.h.orig   2005-02-04 23:22:22 +0100
   +++ include/am_defs.h2005-02-04 23:22:23 +0100
  -@@ -908,6 +908,9 @@
  +@@ -908,6 +908,7 @@
 * Actions to take if rpcsvc/nis.h exists.
 */
#ifdef HAVE_RPCSVC_NIS_H
  -+#ifdef GROUP_OBJ
   +#undef GROUP_OBJ
  -+#endif /* GROUP_OBJ */
# include rpcsvc/nis.h
#endif /* HAVE_RPCSVC_NIS_H */

  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/gift/ gift.spec

2005-02-04 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   04-Feb-2005 20:56:50
  Branch: HEAD Handle: 2005020419564900

  Modified files:
openpkg-src/giftgift.spec

  Log:
imagemagick is no longer required with giFT 0.11.8 and our vorbis-libs
package contains both libvorbis and libogg, so use both

  Summary:
RevisionChanges Path
1.12+5  -13 openpkg-src/gift/gift.spec
  

  patch -p0 '@@ .'
  Index: openpkg-src/gift/gift.spec
  
  $ cvs diff -u -r1.11 -r1.12 gift.spec
  --- openpkg-src/gift/gift.spec1 Jan 2005 10:49:32 -   1.11
  +++ openpkg-src/gift/gift.spec4 Feb 2005 19:56:49 -   1.12
  @@ -34,11 +34,10 @@
   Group:Network
   License:  GPL
   Version:  0.11.8.1
  -Release:  20041128
  +Release:  20050204
   
   #   package options
  -%option   with_imagemagick  yes
  -%option   with_vorbis   yes
  +%option   with_vorbis  yes
   
   #   list of sources
   Source0:  http://osdn.dl.sourceforge.net/gift/gift-%{version}.tar.bz2
  @@ -51,10 +50,6 @@
   PreReq:   OpenPKG, openpkg = 20040130
   BuildPreReq:  file
   PreReq:   file
  -%if %{with_imagemagick} == yes
  -BuildPreReq:  imagemagick
  -PreReq:   imagemagick
  -%endif
   %if %{with_vorbis} == yes
   BuildPreReq:  vorbis-libs
   PreReq:   vorbis-libs
  @@ -89,17 +84,14 @@
   ./configure \
   --prefix=%{l_prefix} \
   --enable-libmagic \
  -%if %{with_imagemagick} == yes
  ---enable-imagemagick \
  ---with-Magick=%{l_prefix} \
  -%else
  ---disable-imagemagick \
  -%endif
   %if %{with_vorbis} == yes
   --enable-libvorbis \
  +--enable-libogg \
   --with-vorbis=%{l_prefix} \
  +--with-ogg=%{l_prefix} \
   %else
   --disable-libvorbis \
  +--disable-ogg \
   %endif
   --disable-shared
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-tools/cmd/ bf-mk.pl

2005-02-04 Thread Thomas Lotterer

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-toolsDate:   04-Feb-2005 10:40:08
  Branch: HEAD Handle: 2005020409400800

  Modified files:
openpkg-tools/cmd   bf-mk.pl

  Log:
protect slave against problems when important environment parameters
cannot be detected (happend after updated rpm segfaulted)

  Summary:
RevisionChanges Path
1.12+4  -4  openpkg-tools/cmd/bf-mk.pl
  

  patch -p0 '@@ .'
  Index: openpkg-tools/cmd/bf-mk.pl
  
  $ cvs diff -u -r1.11 -r1.12 bf-mk.pl
  --- openpkg-tools/cmd/bf-mk.pl2 Feb 2005 21:00:56 -   1.11
  +++ openpkg-tools/cmd/bf-mk.pl4 Feb 2005 09:40:08 -   1.12
  @@ -583,10 +583,10 @@
   }
   
   #main()
  -HOST=`%{driver.hostname} | %{driver.sed} -e 's;\..*$;;'`
  -ARCH=`%{slaves.rpm} --eval '%{l_host_arch}'`
  -OS=`%{slaves.rpm} --eval '%{l_host_os}'`
  -TAG=`%{slaves.rpm} --eval '%{l_tag}'`
  +HOST=`%{driver.hostname} | %{driver.sed} -e 's;\..*$;;'`; [ .$HOST = . ] 
 die HOST detection failed
  +ARCH=`%{slaves.rpm} --eval '%{l_host_arch}'`; [ .$ARCH = . ]  die ARCH 
detection failed
  +OS=`%{slaves.rpm} --eval '%{l_host_os}'`; [ .$OS = . ]  die OS 
detection failed
  +TAG=`%{slaves.rpm} --eval '%{l_tag}'`; [ .$TAG = . ]  die TAG detection 
failed
   if [ .$TERM = .screen ]; then %{driver.shtool} echo -n 
k$HOST-$ARCH-$OS\\; fi
   
   cmd=
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh

[CVS] OpenPKG: openpkg-tools/cmd/ bf-mk.pl src2make.pl

[CVS] OpenPKG: openpkg-src/postfix/ etc.tar postfix.spec

[CVS] OpenPKG: openpkg-src/png/ png.spec

[CVS] OpenPKG: openpkg-src/libpixman/ libpixman.spec

[CVS] OpenPKG: openpkg-src/cairo/ cairo.spec

[CVS] OpenPKG: openpkg-src/amd/ amd.patch amd.spec

[CVS] OpenPKG: openpkg-src/amd/ amd.patch

[CVS] OpenPKG: openpkg-src/gift/ gift.spec

[CVS] OpenPKG: openpkg-tools/cmd/ bf-mk.pl

10 matches

Site Navigation

Mail list logo

Footer information