xrmap/arch.patch

   1 diff -aur xrmap-2.34.orig/Imakefile xrmap-2.34.new/Imakefile
   2 --- xrmap-2.34.orig/Imakefile   2009-01-11 13:26:33.000000000 +0100
   3 +++ xrmap-2.34.new/Imakefile    2009-01-11 13:59:49.000000000 +0100
   4 @@ -1,29 +1,25 @@
   5  XCOMM Install to /usr or /usr/local  (or something else) ??
   6 -DESTDIR=/usr
   7 +DESTDIR=/usr/
   8
   9  XCOMM Name of man subdirectory of DESTDIR:
  10 -MANDIR=/X11R6/man/man1
  11 +MANDIR=share/man/man1
  12
  13  XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
  14 -BINDIR=/X11R6/bin
  15 +BINDIR=bin
  16
  17  XCOMM Name of share subdirectory of xrmap:
  18 -SHAREDIR=/share/xrmap
  19 +SHAREDIR=share/xrmap
  20
  21  XCOMM Name of library subdirectory of DESTDIR:
  22 -EMXBINDIR=$(SHAREDIR)/bin
  23 +EMXBINDIR=bin
  24
  25  XCOMM Name of DOCDIR's subdirectories of DESTDIR:
  26 -DOCDIR=/X11R6/lib/X11/doc
  27 -DOCHTMLDIR=/X11R6/lib/X11/doc/html
  28 +DOCDIR=doc
  29 +DOCHTMLDIR=$(DOCDIR)/html
  30
  31  XCOMM Do you want to use the libxpm bug work around ? Comment out if not
  32  XPMWORKAROUND=-DXPMBUG
  33
  34 -XCOMM Do you want to use GPS tracking
  35 -#define DOGPS=-DDOGPS
  36 -
  37 -
  38  XCOMM Normally -- except for new architectures -- you should be done there.
  39
  40  XCOMM Compile options:
  41 @@ -45,19 +41,12 @@
  42
  43  XCOMM Solaris, Linux
  44  ZLIBDIR=-L/usr/lib
  45 -CCOPTIONS=-O $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\" $(DOGPS)
  46 +CCOPTIONS=-O $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\"
  47  #endif
  48
  49 -#ifdef DOGPS
  50 -SRCS=gpstrack.c explorer.c image.c xrmap.c
  51 -OBJS=gpstrack.o explorer.o image.o xrmap.o
  52 -GPSLIB=-lgps
  53 -#else
  54 -SRCS=explorer.c image.c xrmap.c
  55 -OBJS=explorer.o image.o xrmap.o
  56 -#endif
  57
  58 -LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) $(GPSLIB) $(ZLIBDIR) -ljpeg -lpng -lz -lm
  59 +
  60 +LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) $(ZLIBDIR) -ljpeg -lpng -lz -lm
  61  DEPLIBS=               # I don't know what I'm doing, and I hate imake!
  62
  63  numdefs.h:
  64 diff -aur xrmap-2.34.orig/Makefile.noimake xrmap-2.34.new/Makefile.noimake
  65 --- xrmap-2.34.orig/Makefile.noimake    2009-01-11 13:26:33.000000000 +0100
  66 +++ xrmap-2.34.new/Makefile.noimake     2009-01-11 15:16:06.000000000 +0100
  67 @@ -1,42 +1,30 @@
  68 -DESTDIR=/usr
  69 +DESTDIR=/usr/
  70  X11DIR=$(DESTDIR)/X11R6
  71  SHAREDIR=/share/xrmap
  72 -EMXBINDIR=$(SHAREDIR)/bin
  73 +EMXBINDIR=bin
  74
  75  PS_VIEWER="gv -noantialias"
  76  IM_VIEWER="display -background gray84"
  77 -HTML_VIEWER="dillo"
  78 +HTML_VIEWER="firefox"
  79  PRINT_CMD="lpr -Plocal"
  80 -EDITOR=$(DESTDIR)$(SHAREDIR)"/bin/emx"
  81 +EDITOR=$(DESTDIR)/bin/emx
  82  MIDIPLAYER="timidity -ig"
  83  SVG_VIEWER="inkscape"
  84  SVG_CONVERT="inkscape %s --export-height=%d --export-png=%s"
  85
  86 -# Do you want to use GPS tracking
  87 -# #define DOGPS=-DDOGPS
  88 -
  89 -#ifdef DOGPS
  90 -  GPSLIB=-lgps
  91 -  GPSTRACK=gpstrack.o
  92 -#endif
  93
  94  CCOPTIONS=-O6 -g -Wall -DZLIB -DXPMBUG -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
  95    -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" \
  96    -DSVG_VIEWER=\"$(SVG_VIEWER)\" -DSVG_CONVERT=\"$(SVG_CONVERT)\" \
  97    -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" \
  98    -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\" \
  99 -  -DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\" $(DOGPS)
 100 +  -DEMXBINDIR=\"$(DESTDIR)$(EMXBINDIR)\"
 101
 102  LDOPTIONS=-O6 -g -Wall  -lXpm -lX11 $(GPSLIB) -ljpeg -lz -lpng -lm -L/usr/X11R6/lib
 103  ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 $(GPSLIB) -ljpeg -lz -lpng -lm -L/usr/X11R6/lib
 104
 105  all: $(GPSTRACK) explorer.o image.o xrmap.o
 106 -       gcc $(LDOPTIONS) -o xrmap $(GPSTRACK) explorer.o image.o xrmap.o
 107 -       cd editkit ; make -f Makefile.kit emx \
 108 -           DESTDIR=$(DESTDIR) \
 109 -           BINDIR=$(EMXBINDIR) \
 110 -           MANDIR=$(SHAREDIR)/editkit/man \
 111 -           SHAREDIR=$(SHAREDIR)/editkit/rc
 112 +       gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o
 113         cd earthview ; make DESTDIR=$(DESTDIR)
 114         @cat EXTRADATA
 115
 116 @@ -49,14 +37,11 @@
 117  image.o: image.c
 118         gcc $(CCOPTIONS) -c image.c
 119
 120 -gpstrack.o: gpstrack.h gpstrack.c
 121 -       gcc $(CCOPTIONS) -c gpstrack.c
 122 -
 123  xrmap.o: xrmap.h version.h bitmaps.h numdefs.h menudefs.h gpstrack.h xrmap.c
 124         gcc $(CCOPTIONS) -c xrmap.c
 125
 126  install:
 127 -       install -c -s xrmap $(X11DIR)/bin
 128 +       install -c -s xrmap $(DESTDIR)/bin
 129         mkdir -p $(DESTDIR)$(SHAREDIR)
 130         cp -f Xrmaprc Locations $(DESTDIR)$(SHAREDIR)
 131         ./tools/extprogs >> $(DESTDIR)$(SHAREDIR)/Xrmaprc
 132 @@ -78,15 +63,7 @@
 133         cp -f earthview/README $(DESTDIR)$(SHAREDIR)/doc/README.earthview
 134         cd rc ; rm -f *~
 135         cp -fR rc $(DESTDIR)$(SHAREDIR)
 136 -       cp -f xrmap.man $(X11DIR)/man/man1/xrmap.1x
 137 -       if [ -r $(X11DIR)/xrmap.1x.gz ] ; \
 138 -          then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
 139 -       cd editkit ; make -f Makefile.kit emx \
 140 -           DESTDIR=$(DESTDIR) \
 141 -           BINDIR=$(EMXBINDIR) \
 142 -           MANDIR=$(SHAREDIR)/editkit/man \
 143 -           SHAREDIR=$(SHAREDIR)/editkit/rc ; \
 144 -       make -f Makefile.kit install DESTDIR=$(DESTDIR)
 145 +       cp -f xrmap.man $(DESTDIR)/share/man/man1x/xrmap.1x
 146         cd earthview ; make install DESTDIR=$(DESTDIR)
 147         @cat EXTRADATA
 148
 149 diff -aur xrmap-2.34.orig/earthview/Makefile xrmap-2.34.new/earthview/Makefile
 150 --- xrmap-2.34.orig/earthview/Makefile  2009-01-11 13:26:33.000000000 +0100
 151 +++ xrmap-2.34.new/earthview/Makefile   2009-01-11 15:00:23.000000000 +0100
 152 @@ -2,7 +2,7 @@
 153  DESTDIR=/usr
 154  #fi
 155
 156 -BINDIR=$(DESTDIR)/X11R6/bin
 157 +BINDIR=$(DESTDIR)/bin
 158  DATADIR=$(DESTDIR)/share/xrmap/earthdata
 159
 160  all: earthview
 161 @@ -13,7 +13,7 @@
 162  install:
 163         mkdir -p $(BINDIR)
 164         install -c -s earthview $(BINDIR)
 165 -       cp -f README $(DESTDIR)/share/xrmap/doc/README.earthview
 166 +       cp -f README $(DESTDIR)/share/doc/xrmap/README.earthview
 167
 168  help: earthview
 169         ./earthview -help
 170 diff -aur xrmap-2.34.orig/editkit/Imakefile xrmap-2.34.new/editkit/Imakefile
 171 --- xrmap-2.34.orig/editkit/Imakefile   2009-01-11 13:26:33.000000000 +0100
 172 +++ xrmap-2.34.new/editkit/Imakefile    2009-01-11 14:06:07.000000000 +0100
 173 @@ -5,25 +5,25 @@
 174
 175  XCOMM Name of man subdirectory of DESTDIR:
 176    #ifndef MANDIR
 177 -    MANDIR=/X11R6/man/man1
 178 +    MANDIR=/usr/share/man/man1
 179    #endif
 180
 181  XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
 182    #ifndef BINDIR
 183 -    BINDIR=/X11R6/bin
 184 +    BINDIR=/bin
 185    #endif
 186
 187  XCOMM Name of share subdirectory of DESTDIR_XRMAP:
 188    #ifndef SHAREDIR
 189 -    SHAREDIR=$(DESTDIR)/share/editkit
 190 +    SHAREDIR=$(DESTDIR)/usr/share/xrmap/editkit
 191    #endif
 192
 193  XCOMM Name of DOCDIR's subdirectories of DESTDIR:
 194    #ifndef DOCDIR
 195 -    DOCDIR=/X11R6/lib/X11/doc
 196 +    DOCDIR=$(DESTDIR)/usr/share/doc/xrmap
 197    #endif
 198    #ifndef DOCHTMLDIR
 199 -    DOCHTMLDIR=/X11R6/lib/X11/doc/html
 200 +    DOCHTMLDIR=$(DESTDIR)/usr/share/doc/xrmap/html
 201    #endif
 202
 203  XCOMM
 204 diff -aur xrmap-2.34.orig/editkit/Makefile.kit xrmap-2.34.new/editkit/Makefile.kit
 205 --- xrmap-2.34.orig/editkit/Makefile.kit        2009-01-11 13:26:33.000000000 +0100
 206 +++ xrmap-2.34.new/editkit/Makefile.kit 2009-01-11 14:52:25.000000000 +0100
 207 @@ -14,7 +14,7 @@
 208  # TLL for Terry Loveall personal settings
 209
 210  #ifndef SHAREDIR
 211 -SHAREDIR=/usr/share/editkit
 212 +SHAREDIR=/usr/share/xrmap/editkit
 213  #endif
 214
 215  CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
 216 @@ -60,21 +60,7 @@
 217
 218  emx.o: Makefile version.h messages.def x11.c edit.h edit.c x11_bind_em.c
 219         gcc $(CFLAGS) -DEMACS -o emx.o -c x11.c
 220 -
 221 -install:
 222 -       if [ -x edt ]; then cp -f edt $(BINDIR); fi
 223 -       if [ -x emt ]; then cp -f emt $(BINDIR); fi
 224 -       if [ -x edx ]; then cp -f edx $(BINDIR); fi
 225 -       if [ -x emx ]; then cp -f emx $(BINDIR); fi
 226 -       mkdir -p $(SHAREDIR)
 227 -       cp -f rc.example $(SHAREDIR)/rc.common
 228 -       cp -f README $(SHAREDIR)
 229 -       if [ -x edt ] || [ -x edx ]; then cp -f MANUAL.wo*ar $(SHAREDIR); fi
 230 -       if [ -x emt ] || [ -x emx ]; then cp -f MANUAL.emacs $(SHAREDIR); fi
 231 -       if [ -x edt ]; then cd $(SHAREDIR); ln -sf rc.common edtrc; fi
 232 -       if [ -x emt ]; then cd $(SHAREDIR); ln -sf rc.common emtrc; fi
 233 -       if [ -x edx ]; then cd $(SHAREDIR); ln -sf rc.common edxrc; fi
 234 -       if [ -x emx ]; then cd $(SHAREDIR); ln -sf rc.common emxrc; fi
 235 +       ln -sf rc.common emxrc
 236
 237  clean:
 238         -rm -f *.o *~ edt emt edx emx
 239 diff -aur xrmap-2.34.orig/version.h xrmap-2.34.new/version.h
 240 --- xrmap-2.34.orig/version.h   2009-01-11 13:26:33.000000000 +0100
 241 +++ xrmap-2.34.new/version.h    2009-01-11 15:22:19.000000000 +0100
 242 @@ -2,5 +2,5 @@
 243
 244  #define PACKAGE "xrmap"
 245  #define VERSION "2.34"
 246 -#define DATEPKG "March 13, 2005"
 247 +#define DATEPKG "August 21, 2008"
 248  #define COPYRIGHT "(C) Jean-Pierre Demailly, licensed under the GPL"