diff options
Diffstat (limited to 'misc/xrmap')
| -rw-r--r-- | misc/xrmap/Makefile | 8 | ||||
| -rw-r--r-- | misc/xrmap/distinfo | 2 | ||||
| -rw-r--r-- | misc/xrmap/files/patch-Imakefile | 24 | ||||
| -rw-r--r-- | misc/xrmap/files/patch-editkit-Imakfile | 55 | ||||
| -rw-r--r-- | misc/xrmap/pkg-plist | 32 |
5 files changed, 82 insertions, 39 deletions
diff --git a/misc/xrmap/Makefile b/misc/xrmap/Makefile index 8a7aec5e1d9..ea6898f467c 100644 --- a/misc/xrmap/Makefile +++ b/misc/xrmap/Makefile @@ -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_BZIP2= yes 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 @@ -37,6 +38,9 @@ post-extract: ${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 ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile diff --git a/misc/xrmap/distinfo b/misc/xrmap/distinfo index fbfb3633976..de8b10f4046 100644 --- a/misc/xrmap/distinfo +++ b/misc/xrmap/distinfo @@ -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 diff --git a/misc/xrmap/files/patch-Imakefile b/misc/xrmap/files/patch-Imakefile index ac6d441013e..195ae16611b 100644 --- a/misc/xrmap/files/patch-Imakefile +++ b/misc/xrmap/files/patch-Imakefile @@ -1,5 +1,5 @@ ---- Imakefile.orig Sat May 10 09:02:50 2003 -+++ Imakefile Sat May 10 22:00:54 2003 +--- 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 @@ -42,7 +42,7 @@ #endif -@@ -62,28 +63,35 @@ +@@ -63,31 +64,37 @@ ComplexProgramTarget(xrmap) install.man:: @@ -53,7 +53,7 @@ all:: strip xrmap ; ls -al xrmap - cd editkit ; make emx + cd editkit ; xmkmf ; make install:: install.man - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR) @@ -67,6 +67,9 @@ 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 @@ -80,12 +83,13 @@ + 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 -+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi + $(MKDIRHIER) $(SHAREDIR)/doc cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP 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 +- 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 + diff --git a/misc/xrmap/files/patch-editkit-Imakfile b/misc/xrmap/files/patch-editkit-Imakfile index cc0365c0f06..1f0c23a73ec 100644 --- a/misc/xrmap/files/patch-editkit-Imakfile +++ b/misc/xrmap/files/patch-editkit-Imakfile @@ -1,16 +1,45 @@ ---- 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 +--- 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 -+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)\"" + 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) - #CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL + clean:: + rm -f *~ diff --git a/misc/xrmap/pkg-plist b/misc/xrmap/pkg-plist index 89518b225d8..0e59858615f 100644 --- a/misc/xrmap/pkg-plist +++ b/misc/xrmap/pkg-plist @@ -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/yu.ant 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/unix.xpm 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 -@dirrm share/rmap/themes/optional -@dirrm share/rmap/themes/buttons +@dirrm share/rmap/rc @dirrm share/rmap/themes +@dirrm share/rmap/pixmaps/optional +@dirrm share/rmap/pixmaps/buttons +@dirrm share/rmap/pixmaps @dirrm share/rmap/postscript @dirrm share/rmap/picons @dirrm share/rmap/pdfmaps |