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 openpkg-web          Date:   22-Feb-2003 15:59:56
  Branch: HEAD                             Handle: 2003022214595401

  Added files:
    openpkg-src/mgv         mgv.sh
  Modified files:
    openpkg-src/mgv         mgv.patch mgv.spec
    openpkg-web             news.txt

  Log:
    try to finish this package

  Summary:
    Revision    Changes     Path
    1.2         +68 -0      openpkg-src/mgv/mgv.patch
    1.1         +6  -0      openpkg-src/mgv/mgv.sh
    1.3         +18 -23     openpkg-src/mgv/mgv.spec
    1.3409      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mgv/mgv.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 mgv.patch
  --- openpkg-src/mgv/mgv.patch 21 Feb 2003 11:17:41 -0000      1.1
  +++ openpkg-src/mgv/mgv.patch 22 Feb 2003 14:59:55 -0000      1.2
  @@ -52,3 +52,71 @@
    EOF
    
    else
  +--- wlib/wlib/sanity.h.orig  Thu Aug 27 05:22:41 1998
  ++++ wlib/wlib/sanity.h       Sat Feb 22 13:52:34 2003
  +@@ -25,6 +25,7 @@
  + #define     WLIB_SANITY_H
  + MU_HID(wlib_sanity_h, "$Mu: wlib/wlib/sanity.h 1.6 1998/08/27 03:22:41 $")
  + 
  ++#include <stdio.h>
  + #include <assert.h>
  + 
  + #define     ARGSANITY(a,n)  assert((size_t)(n) <= sizeof(a)/sizeof((a)[0]))
  +--- doc/Makefile.in.orig     Mon Sep 28 11:54:02 1998
  ++++ doc/Makefile.in  Sat Feb 22 15:46:52 2003
  +@@ -88,7 +88,7 @@
  +     mgv-21.html mgv-22.html mgv-23.html mgv-24.html mgv-25.html \
  +     mgv-26.html mgv-27.html mgv-28.html mgv-29.html mgv-30.html
  + 
  +-helpdir = $(pkgdatadir)/$(VERSION)/help
  ++helpdir = $(pkgdatadir)/help
  + help_DATA = mgv.html $(mu_htmlchunks) *.gif
  + 
  + SUFFIXES = .gif .sgml-in .sgml .ps .eps
  +--- lib/toolbar/Makefile.in.orig     Mon Sep 28 11:54:02 1998
  ++++ lib/toolbar/Makefile.in  Sat Feb 22 15:47:54 2003
  +@@ -104,7 +104,7 @@
  +     pageNext-i.xpm pageNext.xpm \
  +     pagePrev-i.xpm pagePrev.xpm
  + 
  +-toolbardir = $(pkgdatadir)/$(VERSION)/toolbar
  ++toolbardir = $(pkgdatadir)/toolbar
  + toolbar_DATA = $(mu_bitmaps) $(mu_pixmaps)
  + mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
  + CONFIG_CLEAN_FILES = 
  +--- lib/Makefile.in.orig     Mon Sep 28 11:54:02 1998
  ++++ lib/Makefile.in  Sat Feb 22 15:50:41 2003
  +@@ -78,7 +78,7 @@
  + 
  + SUBDIRS = toolbar
  + 
  +-mgvmiscdir = $(pkgdatadir)/$(VERSION)
  ++mgvmiscdir = $(pkgdatadir)
  + mgvmisc_DATA = icon.xbm icon.xpm mask.xbm splash.xbm splash.xpm
  + mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
  + CONFIG_CLEAN_FILES = 
  +--- Makefile.in.orig Mon Sep 28 11:54:02 1998
  ++++ Makefile.in      Sat Feb 22 15:52:38 2003
  +@@ -85,7 +85,7 @@
  +     @LIBHELP_LIBS@ @XM_LIBS@ @EDITRES_LIBS@ @XT_LIBS@ @XPM_LIBS@ \
  +     @XEXT_LIBS@ @X11_LIBS@
  + 
  +-mgvresdir = $(pkgdatadir)/$(VERSION)
  ++mgvresdir = $(pkgdatadir)
  + mgvres_DATA = MGv
  + 
  + mgv_DEPENDENCIES = _bld.o wlib/libwlib.a
  +@@ -471,11 +471,11 @@
  +     tools/ad2c -a bld_fallbacks MGv > _ad.c
  + 
  + MGv: MGv.ad
  +-    sed -e 's;__DATADIR__;$(datadir)/mgv/$(VERSION);g' -e 
's;__VERSION__;$(VERSION);g' < MGv.ad > MGv || (rm -f MGv; exit 1)
  ++    sed -e 's;__DATADIR__;$(datadir)/mgv;g' -e 's;__VERSION__;$(VERSION);g' < 
MGv.ad > MGv || (rm -f MGv; exit 1)
  + 
  + mgv.1: mgv.man
  +     sed -e 's;__VERSION__;$(VERSION);g' \
  +-            -e 's;__DATADIR__;@datadir@/mgv/$(VERSION)/help;g' \
  ++            -e 's;__DATADIR__;@datadir@/mgv/help;g' \
  +             < mgv.man > mgv.1 || (rm -f mgv.1; exit 1)
  + 
  + @[EMAIL PROTECTED]: doc/mgv.sgml-in
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mgv/mgv.sh
  ============================================================================
  $ cvs diff -u -r0 -r1.1 mgv.sh
  --- /dev/null 2003-02-22 15:59:56.000000000 +0100
  +++ mgv.sh    2003-02-22 15:59:56.000000000 +0100
  @@ -0,0 +1,6 @@
  +#!/bin/sh
  +PATH="@l_prefix@/bin:$PATH"
  +export PATH
  [EMAIL PROTECTED]@/share/mgv
  +export XAPPLRESDIR
  +exec @l_prefix@/libexec/mgv/mgv ${1+"$@"}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mgv/mgv.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 mgv.spec
  --- openpkg-src/mgv/mgv.spec  21 Feb 2003 11:24:51 -0000      1.2
  +++ openpkg-src/mgv/mgv.spec  22 Feb 2003 14:59:55 -0000      1.3
  @@ -1,5 +1,5 @@
   ##
  -##  ghostscript.spec -- OpenPKG RPM Specification
  +##  mgv.spec -- OpenPKG RPM Specification
   ##  Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
   ##  Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
   ##  Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
  @@ -25,36 +25,35 @@
   
   #   package information
   Name:         mgv
  -Summary:      Motif based PostScript viewer
  -URL:          http://www.trends.net/~mu
  +Summary:      PostScript Viewer
  +URL:          http://www.trends.net/~mu/
   Vendor:       Eric A. Howe, Matthew D. Francey
   Packager:     The OpenPKG Project
   Distribution: OpenPKG [EVAL]
   Group:        Graphics
   License:      GNU
   Version:      3.1.5
  -Release:      20030221
  -
  -#   package options
  +Release:      20030222
   
   #   list of sources
   Source0:      http://www.trends.net/~mu/mgv-%{version}.tar.gz
  +Source1:      mgv.sh
   Patch0:       mgv.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030211, X11, lesstif
  -PreReq:       OpenPKG, openpkg >= 20030211, lesstif
  +BuildPreReq:  OpenPKG, openpkg >= 20030211, X11, lesstif, make
  +PreReq:       OpenPKG, openpkg >= 20030211, X11, lesstif, ghostscript
   AutoReq:      no
   AutoReqProv:  no
   
   %description
  -    Mgv is a Motif based PostScript viewer.  Mgv started out as a Motif
  +    Mgv is a Motif based PostScript viewer. Mgv started out as a Motif
       rewrite of the venerable Ghostview 1.5.
   
   %prep
  -    %setup0 -q 
  +    %setup -q
       %patch -p0
   
   %build
  @@ -62,26 +61,22 @@
       x11_lib=`%{l_prefix}/etc/rc --query x11_libdir`
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O} -I${x11_inc}" \
  -    LDFLAGS="%{l_ldflags} -L${x11_lib} -rpath ${x11_lib}" \
  +    LDFLAGS="%{l_ldflags} -L${x11_lib}" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --datadir=%{l_prefix}/share/mgv
  +        --bindir=%{l_prefix}/libexec/mgv \
  +        --enable-optimize \
  +        --disable-debug
       %{l_make} %{l_mflags}
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -
  -    #   create filesystem hierachy
  +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man1
  -
  -    #   install files
  -    %{l_shtool} install -c -s -m 755 \
  -        mgv $RPM_BUILD_ROOT%{l_prefix}/bin
  -    %{l_shtool} install -c -m 644 \
  -        mgv.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1
  -
  +        $RPM_BUILD_ROOT%{l_prefix}/bin
  +    %{l_shtool} install -c -m 755 \
  +        -e 's;@l_prefix@;%{l_prefix};g' \
  +        %{SOURCE mgv.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/mgv
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3408 -r1.3409 news.txt
  --- openpkg-web/news.txt      22 Feb 2003 12:45:58 -0000      1.3408
  +++ openpkg-web/news.txt      22 Feb 2003 14:59:54 -0000      1.3409
  @@ -1,3 +1,4 @@
  +22-Feb-2003: Upgraded package: P<mgv-3.1.5-20030222>
   22-Feb-2003: Upgraded package: P<openpkg-20030222-20030222>
   22-Feb-2003: Upgraded package: P<subversion-0.18.0-20030222>
   22-Feb-2003: Upgraded package: P<honeyd-0.5-20030222>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to