ports/51627: Update Ports: misc/xrmap to 2.27
Serge Gagnon
gagnon__s at videotron.ca
Wed Apr 30 14:40:14 UTC 2003
>Number: 51627
>Category: ports
>Synopsis: Update Ports: misc/xrmap to 2.27
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 30 07:40:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Serge Gagnon
>Release: FreeBSD 4.8-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix.dyndns.org 4.8-STABLE FreeBSD 4.8-STABLE #0: Sat Apr 5 09:39:35 EST 2003 serge at quenix.dyndns.org:/usr/obj/usr/src/sys/OCEAN2 i386
>Description:
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
>How-To-Repeat:
>Fix:
--- patch-xrmap begins here ---
diff -u /usr/ports/misc/xrmap/Makefile ./Makefile
--- /usr/ports/misc/xrmap/Makefile Mon Apr 7 02:06:44 2003
+++ ./Makefile Tue Apr 29 08:26:57 2003
@@ -6,7 +6,7 @@
#
PORTNAME= xrmap
-PORTVERSION= 2.26
+PORTVERSION= 2.27
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
@@ -26,7 +26,7 @@
MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.bz2
-XRMAPFILE= xrmap-2.26.tar.bz2
+XRMAPFILE= xrmap-2.27.tar.bz2
DISTFILE= anthems-1.1.tar.bz2 \
factbook_text_2002.tar.bz2 factbook_html_2002.tar.bz2 \
flags-1.1.tar.bz2 hymns-1.2.tar.bz2
diff -u /usr/ports/misc/xrmap/distinfo ./distinfo
--- /usr/ports/misc/xrmap/distinfo Fri Apr 18 00:55:23 2003
+++ ./distinfo Tue Apr 29 08:26:57 2003
@@ -1,4 +1,4 @@
-MD5 (xrmap-2.26.tar.bz2) = 623393a75b7a9ded20834add3aa0e748
+MD5 (xrmap-2.27.tar.bz2) = 11a47b0e2c8fdab904759a54684dcb50
MD5 (CIA_WDB2.jpd.bz2) = 8239b0d93bfec8d46d337dad9896774a
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f
diff -u /usr/ports/misc/xrmap/pkg-plist ./pkg-plist
--- /usr/ports/misc/xrmap/pkg-plist Sat Apr 5 09:37:24 2003
+++ ./pkg-plist Wed Apr 30 10:23:56 2003
@@ -201,7 +201,9 @@
share/rmap/anthems/za.ant
share/rmap/anthems/zm.ant
share/rmap/anthems/zw.ant
+share/rmap/doc/Asia.rc
share/rmap/doc/CHANGES
+share/rmap/doc/Europe.rc
share/rmap/doc/EXAMPLE.rc
share/rmap/doc/INSTALL
share/rmap/doc/LICENSE
@@ -209,6 +211,7 @@
share/rmap/doc/README
share/rmap/doc/README.midi
share/rmap/doc/TODO
+share/rmap/doc/USA.rc
share/rmap/doc/WARNING
share/rmap/factbook/countrylisting.html
share/rmap/factbook/extra/Ashmore_and_Cartier_Islands
@@ -2582,6 +2585,17 @@
share/rmap/picons/win.xpm
share/rmap/postscript/macros.ps
share/rmap/postscript/private.ps
+share/rmap/themes/buttons/b0.xpm.gz
+share/rmap/themes/buttons/b1.xpm.gz
+share/rmap/themes/buttons/b2.xpm.gz
+share/rmap/themes/cloudy
+share/rmap/themes/coffee
+share/rmap/themes/default
+share/rmap/themes/optional/clouds.xpm.gz
+share/rmap/themes/optional/coffee.xpm.gz
+share/rmap/themes/optional/landscape.xpm.gz
+share/rmap/themes/optional/sea.xpm.gz
+share/rmap/themes/sea
@dirrm share/editkit
@dirrm share/rmap/anthems
@dirrm share/rmap/doc
@@ -2601,4 +2615,6 @@
@dirrm share/rmap/pdfmaps
@dirrm share/rmap/picons
@dirrm share/rmap/postscript
- at dirrm share/rmap
+ at dirrm share/rmap/themes/buttons
+ at dirrm share/rmap/themes/optional
+ at dirrm share/rmap/themes
--- patch-xrmap ends here ---
--- patch-Imakefile begins here ---
--- 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 ---
--- patch-editkit-Imakfile begins here ---
--- editkit/Makefile.orig Wed Apr 30 09:24:13 2003
+++ editkit/Makefile Wed Apr 30 09:26:32 2003
@@ -12,10 +12,11 @@
# TWOBUTN paste with button3 click, set selection with button3 drag
# MINIMAL to remove bak files, /usr/share/edmtx and e**rc
# TLL for Terry Loveall personal settings
+PREFIX=/usr/X11R6
+SHARE_DIR=$(PREFIX)/share/editkit
+INCLUDES=-I$(PREFIX)/include
-SHARE_DIR=/usr/share/editkit
-
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL
--- patch-editkit-Imakfile ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list