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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re, openpkg-web, openpkg-src Date:   14-Nov-2002 09:15:51
  Branch: HEAD                             Handle: 2002111408154703

  Modified files:
    openpkg-re/vcheck       vc.gd
    openpkg-src/gd          gd.spec
    openpkg-web             news.txt

  Log:
    upgrade by switching to new Autoconf build environment

  Summary:
    Revision    Changes     Path
    1.5         +1  -1      openpkg-re/vcheck/vc.gd
    1.31        +19 -41     openpkg-src/gd/gd.spec
    1.2018      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  Index: openpkg-re/vcheck/vc.gd
  ============================================================
  $ cvs diff -u -r1.4 -r1.5 vc.gd
  --- openpkg-re/vcheck/vc.gd   24 Oct 2002 06:42:05 -0000      1.4
  +++ openpkg-re/vcheck/vc.gd   14 Nov 2002 08:15:47 -0000      1.5
  @@ -2,7 +2,7 @@
   }
   
   prog gd = {
  -  version   = 2.0.4
  +  version   = 2.0.5
     url       = http://www.boutell.com/gd/http/
     regex     = gd-(__VER__)\.tar\.gz
   }
  Index: openpkg-src/gd/gd.spec
  ============================================================
  $ cvs diff -u -r1.30 -r1.31 gd.spec
  --- openpkg-src/gd/gd.spec    24 Oct 2002 07:16:00 -0000      1.30
  +++ openpkg-src/gd/gd.spec    14 Nov 2002 08:15:50 -0000      1.31
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [BASE]
   Group:        Graphics
   License:      GPL
  -Version:      2.0.4
  -Release:      20021024
  +Version:      2.0.5
  +Release:      20021114
   
   #   list of sources
   Source0:      http://www.boutell.com/gd/http/gd-%{version}.tar.gz
  @@ -58,50 +58,28 @@
   
   %prep
       %setup -q
  -    awk <configure '/^print OUT/,/^EOM/ { print $0 }' >Makefile
  -    %{l_shtool} subst \
  -        -e 's;^print OUT.*;;' \
  -        -e 's;^EOM;all: libgd.a $(PROGRAMS);' \
  -        -e 's;^install: .*;install: all;' \
  -        -e 's;$sharedLinkHead;;' \
  -        -e 's;$sharedLinkTail;;' \
  -        -e 's;$oflags;;' \
  -        -e 's;$lflags;;' \
  -        -e 's;$includeDirs;;' \
  -        -e 's;$libDirs;;' \
  -        -e 's;$compiler;;' \
  -        -e 's;$safePrograms;pngtogd pngtogd2 gdtopng gd2topng gd2copypal 
gdparttopng webpng annotate;' \
  -        -e 's;$installCommands.*;;' \
  -        -e 's;$installPrefix;%{l_prefix};' \
  -        -e 's;sh \./install-item ;%{l_shtool} install -c -m ;' \
  -        -e 's;--verbose; ;' \
  -        -e 's;\\\(.\);\1;g' \
  -        Makefile
   
   %build
  -    %{l_make} %{l_mflags} \
  -        COMPILER="%{l_cc}" \
  -        CFLAGS="%{l_cflags -O} -DHAVE_LIBPNG -DHAVE_LIBZ -DHAVE_LIBJPEG 
-DHAVE_LIBFREETYPE" \
  -        INCLUDEDIRS="-I. -I%{l_prefix}/include/libpng 
-I%{l_prefix}/include/freetype2 -I%{l_prefix}/include" \
  -        LIBDIRS="-L. -L%{l_prefix}/lib" \
  -        LIBS="-lm -lgd -lpng -lz -ljpeg -lfreetype -lm" \
  -        all
  +    echo "ac_cv_header_iconv_h=no" >config.cache
  +    CC="%{l_cc}" \
  +    CFLAGS="%{l_cflags -O}" \
  +    CPPFLAGS="%{l_cppflags} -I. -I%{l_prefix}/include/libpng 
-I%{l_prefix}/include/freetype2" \
  +    LDFLAGS="%{l_ldflags} -L." \
  +    LIBS="-lm" \
  +    ./configure \
  +        --cache-file=./config.cache \
  +        --prefix=%{l_prefix} \
  +        --with-x \
  +        --with-png=%{l_prefix} \
  +        --with-freetype=%{l_prefix} \
  +        --with-jpeg=%{l_prefix} \
  +        --disable-shared
  +    %{l_shtool} subst -e 's;-LNONE;;' Makefile
  +    %{l_make} %{l_mflags}
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib \
  -        $RPM_BUILD_ROOT%{l_prefix}/include
  -    %{l_make} %{l_mflags} install \
  -        INSTALL_BIN=$RPM_BUILD_ROOT%{l_prefix}/bin \
  -        INSTALL_LIB=$RPM_BUILD_ROOT%{l_prefix}/lib \
  -        INSTALL_INCLUDE=$RPM_BUILD_ROOT%{l_prefix}/include
  -     %{l_shtool} install -c -m 755 \
  -        bdftogd pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng 
annotate \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin
  -    %{l_shtool} install -c -m 644 \
  -        libgd.a $RPM_BUILD_ROOT%{l_prefix}/lib
  +    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  Index: openpkg-web/news.txt
  ============================================================
  $ cvs diff -u -r1.2017 -r1.2018 news.txt
  --- openpkg-web/news.txt      14 Nov 2002 08:14:24 -0000      1.2017
  +++ openpkg-web/news.txt      14 Nov 2002 08:15:48 -0000      1.2018
  @@ -1,3 +1,4 @@
  +14-Nov-2002: Upgraded package: P<gd-2.0.5-20021114>
   14-Nov-2002: Upgraded package: P<gnutls-0.5.11-20021114>
   13-Nov-2002: Upgraded package: P<vim-6.1.255-20021113>
   13-Nov-2002: Upgraded package: P<uvscan-4.1.6.4233-20021113>
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to