ports/52491: Update port: misc/xrmap to 2.29

Serge Gagnon gagnon__s at videotron.ca
Tue May 20 18:30:09 UTC 2003 

>Number:         52491
>Category:       ports
>Synopsis:       Update port: misc/xrmap to 2.29
>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:   Tue May 20 11:30:06 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: Tue May 6 22:02:29 EDT 2003 serge at quenix.dyndns.org:/usr/obj/usr/src/sys/OCEAN3 i386


>Description:
	o update xrmap to version 2.29
	o as usual, delete the patch files in the filesdir and replace
	with the files in this PR
	o redefine XMKMF in the Makefile because xmkmf -a did not the good thing
	o add a "do-configure:" in the Makefile

Change in the software, according to the author are:
- Implemented a small file explorer widget which is tightly integrated into
  xrmap's file menu. Should be useful to simplify the use of xrmap for
  people unfamiliar with xrmap's internals.

- Modified the behaviour of the 'g' shortcut ('g' now cycles on 3 states,
  no gridlines, gridlines, gridlines with coordinates).

- Improvement in the emx scrollbar (to make it more responsive).

- Introduced Imakefile in editkit.

- Minor bug fixes.

	o Thanks Monsieur Commiter

>How-To-Repeat:

>Fix:


--- patch-xrmap begins here ---
diff -u /usr/ports/misc/xrmap/Makefile ./Makefile
--- /usr/ports/misc/xrmap/Makefile	Sun May 11 16:05:19 2003
+++ ./Makefile	Tue May 20 12:53:13 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xrmap
-PORTVERSION=	2.28
+PORTVERSION=	2.29
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
 		ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
@@ -21,11 +21,12 @@
 USE_IMAKE=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
+ XMKMF=		xmkmf
 
 MAN1=	xrmap.1
 
 CIAFILE=	CIA_WDB2.jpd.gz
-XRMAPFILE=	xrmap-2.28.tar.bz2
+XRMAPFILE=	xrmap-2.29.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
@@ -36,6 +37,9 @@
 	done
 	${TAR} -zxf ${DISTDIR}/pdfmaps-1.1.tar.gz -C ${WRKSRC}
 	${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd
+
+do-configure:
+	cd ${WRKSRC}; ${XMKMF}; cd ${WRKSRC}/editkit; ${XMKMF}
 
 post-configure:
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
diff -u /usr/ports/misc/xrmap/distinfo ./distinfo
--- /usr/ports/misc/xrmap/distinfo	Sun May 11 16:05:19 2003
+++ ./distinfo	Tue May 20 09:12:25 2003
@@ -1,4 +1,4 @@
-MD5 (xrmap-2.28.tar.bz2) = c2f5f9e7624745337a9a4bd21ec90425
+MD5 (xrmap-2.29.tar.bz2) = 8e0ef89c17aca958d855e8c75dff6ab0
 MD5 (CIA_WDB2.jpd.gz) = 01f4fcefd5015cd276c2f5952de4f22a
 MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
 MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f
Only in .: patch-xrmap
diff -u /usr/ports/misc/xrmap/pkg-plist ./pkg-plist
--- /usr/ports/misc/xrmap/pkg-plist	Sun May 11 16:05:19 2003
+++ ./pkg-plist	Tue May 20 14:31:40 2003
@@ -1,6 +1,5 @@
 bin/emx
 bin/xrmap
-share/editkit/MANUAL.emacs
 share/editkit/README
 share/editkit/emxrc
 share/editkit/rc.common
@@ -201,17 +200,14 @@
 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/EXAMPLE.rc
-share/rmap/doc/Europe.rc
 share/rmap/doc/INSTALL
 share/rmap/doc/LICENSE
 share/rmap/doc/MAPEDIT
 share/rmap/doc/README
 share/rmap/doc/README.midi
 share/rmap/doc/TODO
-share/rmap/doc/USA.rc
 share/rmap/doc/VECTORMAP
 share/rmap/doc/WARNING
 share/rmap/factbook/countrylisting.html
@@ -2584,22 +2580,32 @@
 share/rmap/picons/visacard.xpm
 share/rmap/picons/wheel.xpm
 share/rmap/picons/win.xpm
+share/rmap/pixmaps/buttons/b0.xpm.gz
+share/rmap/pixmaps/buttons/b1.xpm.gz
+share/rmap/pixmaps/buttons/b2.xpm.gz
+share/rmap/pixmaps/optional/clouds.xpm.gz
+share/rmap/pixmaps/optional/coffee.xpm.gz
+share/rmap/pixmaps/optional/landscape.xpm.gz
+share/rmap/pixmaps/optional/sea.xpm.gz
 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/rc/Africa.rc
+share/rmap/rc/Asia.rc
+share/rmap/rc/Australia.rc
+share/rmap/rc/Europe.rc
+share/rmap/rc/NorthAmerica.rc
+share/rmap/rc/Russia.rc
+share/rmap/rc/SouthAmerica.rc
+share/rmap/rc/USA.rc
 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
- at dirrm share/rmap/themes/optional
- at dirrm share/rmap/themes/buttons
+ at dirrm share/rmap/rc
 @dirrm share/rmap/themes
+ at dirrm share/rmap/pixmaps/optional
+ at dirrm share/rmap/pixmaps/buttons
+ at dirrm share/rmap/pixmaps
 @dirrm share/rmap/postscript
 @dirrm share/rmap/picons
 @dirrm share/rmap/pdfmaps
--- patch-xrmap ends here ---

--- patch-Imakefile begins here ---
--- Imakefile.orig	Tue May 20 09:15:57 2003
+++ Imakefile	Tue May 20 09:26:51 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)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
 
 #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)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
 
 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)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
 
 #endif
 
@@ -63,31 +64,37 @@
 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::
 	strip xrmap ; ls -al xrmap
 	cd editkit ; xmkmf ; make
 
 install:: install.man
-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
-	cp -f Xrmaprc Locations $(DESTDIR)$(SHAREDIR)
+	$(MKDIRHIER) $(SHAREDIR)
+	cp -f Xrmaprc Locations CIA_WDB2.jpd $(SHAREDIR)
+	cp -f Xrmaprc Locations $(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)
 	cd pixmaps ;
-	cp -fR pixmaps  $(DESTDIR)$(SHAREDIR)
+	cp -fR pixmaps  $(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 VECTORMAP WARNING \
-	      EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
+	      EXAMPLE.rc midi_cfg/README.midi $(SHAREDIR)/doc
 	cd rc ; rm -f *~
-	cp -fR rc $(DESTDIR)$(SHAREDIR)
+	cp -fR rc $(SHAREDIR)
 	cd editkit ; xmkmf ; make install
 	cat WARNING
 
--- patch-Imakefile ends here ---

--- patch-editkit-Imakefile begins here ---
--- editkit/Imakefile.orig	Sun May 18 15:41:24 2003
+++ editkit/Imakefile	Tue May 20 12:44:02 2003
@@ -1,14 +1,16 @@
 XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
+DESTDIR=
+PREFIX=	/usr/X11R6
+INCLUDES= $(PREFIX)/include
 
 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:
-SHARE_DIR=/share/editkit
+SHARE_DIR=$(PREFIX)/share/editkit
 
 XCOMM
 XCOMM Normally -- except for new architectures -- you should be done there.
@@ -17,7 +19,7 @@
 XCOMM Compile options:
 XCOMM
 
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(DESTDIR)$(SHARE_DIR)\""
+CFLAGS = -I$(INCLUDES) -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
 
 LOCAL_LIBRARIES=$(XLIB)
 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
@@ -32,9 +34,9 @@
 
 install::
 	mkdir -p $(DESTDIR)$(SHARE_DIR)
-	cp -f rc.example $(DESTDIR)$(SHARE_DIR)/rc.common
-	cd $(DESTDIR)$(SHARE_DIR); ln -sf rc.common emxrc
-	cp -f README $(DESTDIR)$(SHARE_DIR)
+	cp -f rc.example $(SHARE_DIR)/rc.common
+	cd $(SHARE_DIR); ln -sf rc.common emxrc
+	cp -f README $(SHARE_DIR)
 
 clean::
 	rm -f *~
--- patch-editkit-Imakefile ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list