o Update xrmap to 2.27 o Changes are: - Implemented +dms option (degree-minute-second mode) - Implemented background pixmaps and themes, with related command line options -pixmap and -theme, and configuration of themes within the GUI - Created four built-in themes ("default", "cloudy", "coffee", "sea") - Modified the no-edit mode in the 'emx' editor. Everything is now enabled except saving a file. Especially, it becomes possible to use key bindings in no-edit mode. - Added a few more examples, now located in ./examples - Corrected bug in .eps output (incorrect centering in spherical mode) o Also fix pkg-plist to do not remove the ${X11BASE}/share/rmap directory o You'll have to replace the patch file in the ${FILESDIR} with those I prvide with this PR Fix: --- Imakefile.orig Wed Apr 30 09:09:43 2003 +++ Imakefile Wed Apr 30 09:20:21 2003 @@ -1,14 +1,15 @@ XCOMM Should install to /usr or /usr/local ?? -DESTDIR=/usr +DESTDIR= +PREFIX=/usr/X11R6 XCOMM Name of man subdirectory of DESTDIR: -MANDIR=/X11R6/man/man1 +MANDIR=$(PREFIX)/man/man1 XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin -BINDIR=/X11R6/bin +BINDIR=$(PREFIX)/bin XCOMM Name of share subdirectory of DESTDIR: -SHAREDIR=/share/rmap +SHAREDIR=$(PREFIX)/share/rmap XCOMM Default external utilities : XCOMM PostScript viewer, image viewer, HTML viewer, Print command @@ -33,18 +34,18 @@ XCOMM HP-UX ZLIBDIR= -CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\" +CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\" #else XCOMM SunOS ZLIBDIR=-L/usr/lib -CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\" +CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\" XCOMM Solaris, Linux ZLIBDIR=-L/usr/lib -CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\" +CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\" #endif @@ -62,27 +63,32 @@ ComplexProgramTarget(xrmap) install.man:: - if [ -r $(DESTDIR)$(MANDIR)/xrmap.1x.gz ] ; \ - then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi + if [ -r $(MANDIR)/xrmap.1x.gz ] ; \ + then gzip -f $(MANDIR)/xrmap.1x ; fi all:: cd editkit ; make emx install:: install.man - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR) - cp -f Xrmaprc Locations $(DESTDIR)$(SHAREDIR) + $(MKDIRHIER) $(SHAREDIR) + cp -f Xrmaprc Locations CIA_WDB2.jpd $(SHAREDIR) cd postscript ; rm -f *~ - cp -fR postscript $(DESTDIR)$(SHAREDIR) + cp -fR postscript $(SHAREDIR) cd themes ; rm -f *~ - cp -fR themes $(DESTDIR)$(SHAREDIR) + cp -fR themes $(SHAREDIR) if [ -d i18n ] ; then cd i18n ; rm -f *~ ; fi - if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags - if [ -d picons ] ; then cp -fR picons $(DESTDIR)$(SHAREDIR) ; fi - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/doc + if [ -d i18n ] ; then cp -fR i18n $(SHAREDIR) ; fi + $(MKDIRHIER) $(SHAREDIR)/flags + if [ -d flags ] ; then cp -fR flags $(SHAREDIR); fi + if [ -d anthems ] ; then cp -fR anthems $(SHAREDIR); fi + if [ -d hymns ] ; then cp -fR hymns $(SHAREDIR); fi + if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi + if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi + if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi + $(MKDIRHIER) $(SHAREDIR)/doc cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO WARNING \ - midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc - cd examples ; cp -f * $(DESTDIR)$(SHAREDIR)/doc + midi_cfg/README.midi $(SHAREDIR)/doc + cd examples ; cp -f * $(SHAREDIR)/doc cd editkit ; make install cat WARNING --- patch-Imakefile ends here ---
State Changed From-To: open->closed committed, thanks