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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   15-Jan-2003 11:01:55
  Branch: HEAD                             Handle: 2003011510015500

  Added files:
    openpkg-src/magicpoint  default.mgp
  Modified files:
    openpkg-src/magicpoint  magicpoint.spec

  Log:
    add non-ttf defaults

  Summary:
    Revision    Changes     Path
    1.1         +22 -0      openpkg-src/magicpoint/default.mgp
    1.23        +10 -2      openpkg-src/magicpoint/magicpoint.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/magicpoint/default.mgp
  ============================================================================
  $ cvs diff -u -r0 -r1.1 default.mgp
  --- /dev/null 2003-01-15 11:01:55.000000000 +0100
  +++ default.mgp       2003-01-15 11:01:55.000000000 +0100
  @@ -0,0 +1,22 @@
  +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  +%%
  +%% This default.mgp uses standard X11 fonts
  +%%
  +%deffont "standard"   xfont "helvetica-medium-r"
  +%deffont "thick"      xfont "helvetica-bold-r"
  +%deffont "typewriter" xfont "courier-medium-r"
  +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  +%%
  +%% Default settings per each line numbers.
  +%%
  +%default 1 area 90 90, leftfill, size 2, fore "white", back "black", font "thick"
  +%default 2 size 7, vgap 10, prefix " "
  +%default 3 size 2, bar "gray70", vgap 10
  +%default 4 size 5, fore "white", vgap 30, prefix " ", font "standard"
  +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  +%%
  +%% Default settings that are applied to TAB-indented lines.
  +%%
  +%tab 1 size 5, vgap 40, prefix "  ", icon box "green" 50
  +%tab 2 size 4, vgap 40, prefix "      ", icon arc "yellow" 50
  +%tab 3 size 3, vgap 40, prefix "            ", icon delta3 "white" 40
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/magicpoint/magicpoint.spec
  ============================================================================
  $ cvs diff -u -r1.22 -r1.23 magicpoint.spec
  --- openpkg-src/magicpoint/magicpoint.spec    15 Jan 2003 09:04:46 -0000      1.22
  +++ openpkg-src/magicpoint/magicpoint.spec    15 Jan 2003 10:01:55 -0000      1.23
  @@ -38,6 +38,7 @@
   #   list of sources
   Source0:      ftp://ftp.mew.org/pub/mgp/magicpoint-%{version}.tar.gz
   Source1:      ftp://ftp.mew.org/pub/mgp/ttf.tar.gz
  +Source2:      default.mgp
   Patch0:       magicpoint.patch
   
   #   build information
  @@ -58,6 +59,14 @@
       %patch0 -p0
   
   %build
  +    # patch paths to data directory
  +    %{l_shtool} subst \
  +        -e 's;/usr/X11R6/lib/X11/mgp;%{l_prefix}/share/mgp;g' \
  +        USAGE
  +    %{l_shtool} subst \
  +        -e 's;\$(LIBDIR)/mgp;%{l_prefix}/share/mgp;g' \
  +        Imakefile.in
  +
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       ./configure \
  @@ -72,7 +81,6 @@
       imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11config
       %{l_make} Makefiles IMAKE_DEFINES="-DHasGcc2 -UHasSunC"
       %{l_make} includes
  -
       %{l_make}
   
   %install
  @@ -93,7 +101,7 @@
       %{l_shtool} install -c -s -m 755 \
           contrib/xwintoppm/xwintoppm $RPM_BUILD_ROOT%{l_prefix}/bin/
       %{l_shtool} install -c -m 644 \
  -        sample/default.mgp $RPM_BUILD_ROOT%{l_prefix}/share/mgp/
  +        %{SOURCE default.mgp} $RPM_BUILD_ROOT%{l_prefix}/share/mgp/
       %{l_shtool} install -c -m 644 \
           sample/mgp[1-3].jpg $RPM_BUILD_ROOT%{l_prefix}/share/mgp/image/
       %{l_shtool} install -c -m 644 \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to