- Update to 2.33

- Move to a more appropriate category (astro)

PR:             ports/90347
Submitted by:   Serge Gagnon (maintainer)
This commit is contained in:
Sergey Matveychuk 2005-12-16 22:06:55 +00:00
parent 62ebcfd1d4
commit c105877d96
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=151345
14 changed files with 439 additions and 6321 deletions

1
MOVED
View file

@ -2037,3 +2037,4 @@ net-mgmt/netqc||2005-12-15|Mastersite disappeared, conflicting dependencies
net-im/xicq||2005-12-15|Mastersite disappeared
java/jde-emacs20||2005-12-15|Dependency cedet-emacs20 no longer exists
net/beacon-server||2005-12-15|Integrated in net/beacon
misc/xrmap|astro/xrmap|2005-12-17|Move to a more appropriate category

View file

@ -66,6 +66,7 @@
SUBDIR += xphoon
SUBDIR += xplanet
SUBDIR += xtide
SUBDIR += xrmap
SUBDIR += xworld
.include <bsd.port.subdir.mk>

View file

@ -6,9 +6,8 @@
#
PORTNAME= xrmap
PORTVERSION= 2.32
PORTREVISION= 2
CATEGORIES= misc
PORTVERSION= 2.33
CATEGORIES= astro
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src
DISTFILES= ${SRCFILE}:src ${DATAFILES:S|$|:data|} ${CIAFILE}:data ${POPFILE}:data
@ -18,20 +17,22 @@ EXTRACT_ONLY= ${SRCFILE} ${DATAFILES}
MAINTAINER= serge.gagnon@b2b2c.ca
COMMENT= Map portions of the earth from a given longitude/latitude
BROKEN= Unfetchable
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
USE_BZIP2= yes
USE_IMAKE= yes
MANCOMPRESSED= no
USE_XPM= yes
USE_XLIB= yes
USE_REINPLACE= yes
CIAFILE= CIA_WDB2.jpd.bz2
POPFILE= population.dat.bz2
SRCFILE= xrmap-${PORTVERSION}.tar.bz2
DATAFILES= anthems-1.1.tar.bz2 earthdata_med_res.tar.bz2 \
DATAFILES= anthems-1.2.tar.bz2 earthdata_med_res.tar.bz2 \
factbook_text_2005.tar.bz2 factbook_html_2005.tar.bz2 \
flags-2.0.tar.bz2 hymns-1.2.tar.bz2 pdfmaps-1.2.tar.bz2
flags-2.7-eps.tar.bz2 hymns-1.3.tar.bz2 pdfmaps-1.3.tar.bz2
MAN1= emx.1 xrmap.1
PORTDOCS= *
@ -55,6 +56,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xrmap ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xrmap._man ${PREFIX}/man/man1/xrmap.1
${MKDIR} ${PREFIX}/share/rmap
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/rmap/
.for f in Locations Xrmaprc i18n picons pixmaps postscript rc themes
cd ${WRKSRC} && \
${FIND} ${f} -type d -exec ${MKDIR} "${PREFIX}/share/rmap/{}" \; && \
@ -83,10 +85,6 @@ do-install:
${FIND} ${f} ! -type d ! -type l -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/rmap/{}" \;
.endfor
# install examples
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/EXAMPLE.rc ${EXAMPLESDIR}
# install documentation
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}

View file

@ -1,20 +1,30 @@
MD5 (xrmap/xrmap-2.32.tar.bz2) = 3ad9f956867540c9e97044b51f76b13f
SIZE (xrmap/xrmap-2.32.tar.bz2) = 1133345
MD5 (xrmap/anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
SIZE (xrmap/anthems-1.1.tar.bz2) = 95748
MD5 (xrmap/xrmap-2.33.tar.bz2) = c743f0c90699227d5bdba4984e3edf77
SHA256 (xrmap/xrmap-2.33.tar.bz2) = 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440
SIZE (xrmap/xrmap-2.33.tar.bz2) = 1224699
MD5 (xrmap/anthems-1.2.tar.bz2) = f69ffa62fa798a62657038250786795d
SHA256 (xrmap/anthems-1.2.tar.bz2) = 8c26877bfd8736800c7df4e3d18a3bb3a3ea77660be177897684fc18cedee3c2
SIZE (xrmap/anthems-1.2.tar.bz2) = 106164
MD5 (xrmap/earthdata_med_res.tar.bz2) = d1754a7bf81d97c3338da30db467598c
SHA256 (xrmap/earthdata_med_res.tar.bz2) = 42556f286b11e2408f164a5c49cfa12e9ccde2b4cecd6689a054a3a580080990
SIZE (xrmap/earthdata_med_res.tar.bz2) = 50589431
MD5 (xrmap/factbook_text_2005.tar.bz2) = f455f3c6bbd4fe3a77ab0e0c04c19eeb
SHA256 (xrmap/factbook_text_2005.tar.bz2) = 3aa85fc814065dc8b34341baa1b870cd15cf9530bef8ec5f3aa368a97009e1a8
SIZE (xrmap/factbook_text_2005.tar.bz2) = 745471
MD5 (xrmap/factbook_html_2005.tar.bz2) = 237d7fdd1e98174fe8f5886be597248e
SHA256 (xrmap/factbook_html_2005.tar.bz2) = 03d2c2ef16fb9c4617a519d0ef1b74719f62fa85301e807d69cdcb0940069aa9
SIZE (xrmap/factbook_html_2005.tar.bz2) = 27193880
MD5 (xrmap/flags-2.0.tar.bz2) = 6e6ccf6efc6e208a7f755a6b7dc3b54c
SIZE (xrmap/flags-2.0.tar.bz2) = 5770432
MD5 (xrmap/hymns-1.2.tar.bz2) = b5c1c26e1d5c842c53c9a5460cb02864
SIZE (xrmap/hymns-1.2.tar.bz2) = 612060
MD5 (xrmap/pdfmaps-1.2.tar.bz2) = 96839f8745bd5defe40384daccd253d8
SIZE (xrmap/pdfmaps-1.2.tar.bz2) = 46412445
MD5 (xrmap/flags-2.7-eps.tar.bz2) = 48a89683e03bb10b97dfcd526abf0bec
SHA256 (xrmap/flags-2.7-eps.tar.bz2) = 854555e9958bcefe6e57b5048622c8334bc4d9f198f02d0309dca7a97cf07f64
SIZE (xrmap/flags-2.7-eps.tar.bz2) = 4182818
MD5 (xrmap/hymns-1.3.tar.bz2) = 85483d2fe168e0b5e8ca4fc422341ee6
SHA256 (xrmap/hymns-1.3.tar.bz2) = db24f5ab2b9e28eaacb485cbfae1769077bd051d78c3ae760832a2836b4d4b2f
SIZE (xrmap/hymns-1.3.tar.bz2) = 674847
MD5 (xrmap/pdfmaps-1.3.tar.bz2) = 049df5f1c9d3f1fe105d214ce45ef687
SHA256 (xrmap/pdfmaps-1.3.tar.bz2) = eb90dc5949b5233ad94f7258efc11c87d307fa956b713510965c0f7b295b46c6
SIZE (xrmap/pdfmaps-1.3.tar.bz2) = 48457671
MD5 (xrmap/CIA_WDB2.jpd.bz2) = 8b5255a685bbb5eef2f86df182731a32
SHA256 (xrmap/CIA_WDB2.jpd.bz2) = 0a17a17ecc49e1bd4825ff2ae2d6e7dfab6b8a4e344f670f68ecb0e748065354
SIZE (xrmap/CIA_WDB2.jpd.bz2) = 6750214
MD5 (xrmap/population.dat.bz2) = 0fa2a9b9805f55aa021456bccd4f5281
SHA256 (xrmap/population.dat.bz2) = bfdbfd6480186657d3ed9815130ca98177b1f5dc3094c177b9ca11f77a6719bc
SIZE (xrmap/population.dat.bz2) = 823796

View file

@ -1,10 +1,11 @@
--- Imakefile.orig Tue Sep 6 22:47:09 2005
+++ Imakefile Thu Oct 27 11:48:43 2005
@@ -15,22 +15,20 @@
--- Imakefile.orig Sun Nov 6 16:50:22 2005
+++ Imakefile Tue Dec 13 13:43:21 2005
@@ -15,15 +15,15 @@
DOCHTMLDIR=/X11R6/lib/X11/doc/html
XCOMM Do you want to use the libxpm bug work around ? Comment out if not
-XPMWORKAROUND=-DXPMBUG
+XCOMM XPMWORKAROUND=-DXPMBUG
XCOMM Default external utilities :
XCOMM PostScript viewer, image viewer, HTML viewer, Print command
@ -15,28 +16,29 @@
-HTML_VIEWER="dillo"
+PS_VIEWER="gv --noantialias"
+IM_VIEWER="qiv"
+HTML_VIEWER="mozilla"
+HTML_VIEWER="firefox"
PRINT_CMD="lpr -Plp"
EDITOR="emx"
EDITOR="emx -fn 9x15"
MIDIPLAYER="timidity -ig"
XCOMM SVG viewer - select which one you prefer
-XCOMM SVG_VIEWER="xsvg -f"
-SVG_VIEWER="inkview"
+SVG_VIEWER="xsvg -f"
XCOMM Normally -- except for new architectures -- you should be done there.
@@ -62,7 +60,7 @@
@@ -63,7 +63,7 @@
XCOMM Solaris, Linux
ZLIBDIR=-L/usr/lib
-CCOPTIONS=-O $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
+CCOPTIONS=$(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
+CCOPTIONS=-I/usr/local/include $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
-DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" \
-DSVG_VIEWER=\"$(SVG_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" \
-DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" \
@@ -91,8 +89,6 @@
-DSVG_VIEWER=\"$(SVG_VIEWER)\" -DSVG_CONVERT=\"$(SVG_CONVERT)\" \
-DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" \
@@ -74,7 +74,7 @@
SRCS=explorer.c image.c xrmap.c
OBJS=explorer.o image.o xrmap.o
-LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) $(ZLIBDIR) -ljpeg -lpng -lz -lm
+LOCAL_LIBRARIES=$(XLIB) $(XPMLIB) $(ZLIBDIR) -L/usr/local/lib -ljpeg -lpng -lz -lm
DEPLIBS= # I don't know what I'm doing, and I hate imake!
numdefs.h:
@@ -93,8 +93,6 @@
all::
cd editkit ; xmkmf ; make DESTDIR=$(DESTDIR)
cd earthview ; make DESTDIR=$(DESTDIR)
@ -44,4 +46,12 @@
- @cat EXTRADATA
install:: install.man
install:: all install.man
@@ -120,7 +118,6 @@
cp -fR rc $(DESTDIR)$(SHAREDIR)
cd editkit ; xmkmf ; make install DESTDIR=$(DESTDIR)
cd earthview ; make install DESTDIR=$(DESTDIR)
- @cat EXTRADATA
clean::
cd tools ; make clean DESTDIR=$(DESTDIR)

File diff suppressed because it is too large Load diff

View file

@ -463,7 +463,6 @@
SUBDIR += xless
SUBDIR += xosd
SUBDIR += xpns
SUBDIR += xrmap
SUBDIR += xtail
SUBDIR += xtar
SUBDIR += xtypo

View file

@ -1,102 +0,0 @@
# New ports collection makefile for: xrmap
# Date created: 25 Dec 2001
# Whom: petef
#
# $FreeBSD$
#
PORTNAME= xrmap
PORTVERSION= 2.32
PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src
DISTFILES= ${SRCFILE}:src ${DATAFILES:S|$|:data|} ${CIAFILE}:data ${POPFILE}:data
DIST_SUBDIR= xrmap
EXTRACT_ONLY= ${SRCFILE} ${DATAFILES}
MAINTAINER= serge.gagnon@b2b2c.ca
COMMENT= Map portions of the earth from a given longitude/latitude
BROKEN= Unfetchable
USE_BZIP2= yes
USE_IMAKE= yes
MANCOMPRESSED= no
USE_XPM= yes
USE_REINPLACE= yes
CIAFILE= CIA_WDB2.jpd.bz2
POPFILE= population.dat.bz2
SRCFILE= xrmap-${PORTVERSION}.tar.bz2
DATAFILES= anthems-1.1.tar.bz2 earthdata_med_res.tar.bz2 \
factbook_text_2005.tar.bz2 factbook_html_2005.tar.bz2 \
flags-2.0.tar.bz2 hymns-1.2.tar.bz2 pdfmaps-1.2.tar.bz2
MAN1= emx.1 xrmap.1
PORTDOCS= *
MAKE_ARGS= DESTDIR="${PREFIX}"
post-extract:
@${BZIP2_CMD} -dc ${_DISTDIR}/${CIAFILE} >${WRKDIR}/CIA_WDB2.jpd
@${MKDIR} ${WRKDIR}/earthdata/population
@${BZIP2_CMD} -dc ${_DISTDIR}/${POPFILE} > \
${WRKDIR}/earthdata/population/population.dat
@${RM} -f ${WRKDIR}/flags/svg/=
post-patch:
@${REINPLACE_CMD} -Ee 's|cc |$(CC) $(CFLAGS) |' ${WRKSRC}/tools/Makefile
@${REINPLACE_CMD} -Ee '/FLAGPATH/ s,/(xpm|svg|eps|png),,' ${WRKSRC}/xrmap.c
@${REINPLACE_CMD} -e 's|SHAREDIR"/doc"|"${DOCSDIR}"|' ${WRKSRC}/xrmap.h
do-install:
# install xrmap
${INSTALL_PROGRAM} ${WRKSRC}/xrmap ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xrmap._man ${PREFIX}/man/man1/xrmap.1
${MKDIR} ${PREFIX}/share/rmap
.for f in Locations Xrmaprc i18n picons pixmaps postscript rc themes
cd ${WRKSRC} && \
${FIND} ${f} -type d -exec ${MKDIR} "${PREFIX}/share/rmap/{}" \; && \
${FIND} ${f} -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/rmap/{}" \;
.endfor
# install editkit
${INSTALL_PROGRAM} ${WRKSRC}/editkit/emx ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/editkit/emx._man ${PREFIX}/man/man1/emx.1
${MKDIR} ${PREFIX}/share/editkit
${INSTALL_DATA} ${WRKSRC}/editkit/rc.example ${PREFIX}/share/editkit/rc.common
cd ${PREFIX}/share/editkit && ${LN} -sf rc.common emxrc
# install earthview
${INSTALL_PROGRAM} ${WRKSRC}/earthview/earthview ${PREFIX}/bin
.for f in population topography
${MKDIR} ${PREFIX}/share/rmap/earthdata/${f}
${INSTALL_DATA} ${WRKSRC}/earthview/data/${f}.cps ${PREFIX}/share/rmap/earthdata/${f}
.endfor
# install extra data
.for f in CIA_WDB2.jpd anthems earthdata factbook flags hymns pdfmaps
cd ${WRKDIR} && \
${FIND} ${f} -type d -exec ${MKDIR} "${PREFIX}/share/rmap/{}" \; && \
${FIND} ${f} -type l -exec ${CP} -Rf "{}" "${PREFIX}/share/rmap/{}" \; && \
${FIND} ${f} ! -type d ! -type l -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/rmap/{}" \;
.endfor
# install examples
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/EXAMPLE.rc ${EXAMPLESDIR}
# install documentation
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
. for doc in CHANGES MAPEDIT TODO VECTORMAP
${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
. endfor
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README.xrmap
${INSTALL_DATA} ${WRKSRC}/editkit/README ${DOCSDIR}/README.editkit
${INSTALL_DATA} ${WRKSRC}/earthview/README ${DOCSDIR}/README.earthview
${INSTALL_DATA} ${WRKSRC}/midi_cfg/README.midi ${DOCSDIR}
.endif
.include <bsd.port.mk>

View file

@ -1,20 +0,0 @@
MD5 (xrmap/xrmap-2.32.tar.bz2) = 3ad9f956867540c9e97044b51f76b13f
SIZE (xrmap/xrmap-2.32.tar.bz2) = 1133345
MD5 (xrmap/anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
SIZE (xrmap/anthems-1.1.tar.bz2) = 95748
MD5 (xrmap/earthdata_med_res.tar.bz2) = d1754a7bf81d97c3338da30db467598c
SIZE (xrmap/earthdata_med_res.tar.bz2) = 50589431
MD5 (xrmap/factbook_text_2005.tar.bz2) = f455f3c6bbd4fe3a77ab0e0c04c19eeb
SIZE (xrmap/factbook_text_2005.tar.bz2) = 745471
MD5 (xrmap/factbook_html_2005.tar.bz2) = 237d7fdd1e98174fe8f5886be597248e
SIZE (xrmap/factbook_html_2005.tar.bz2) = 27193880
MD5 (xrmap/flags-2.0.tar.bz2) = 6e6ccf6efc6e208a7f755a6b7dc3b54c
SIZE (xrmap/flags-2.0.tar.bz2) = 5770432
MD5 (xrmap/hymns-1.2.tar.bz2) = b5c1c26e1d5c842c53c9a5460cb02864
SIZE (xrmap/hymns-1.2.tar.bz2) = 612060
MD5 (xrmap/pdfmaps-1.2.tar.bz2) = 96839f8745bd5defe40384daccd253d8
SIZE (xrmap/pdfmaps-1.2.tar.bz2) = 46412445
MD5 (xrmap/CIA_WDB2.jpd.bz2) = 8b5255a685bbb5eef2f86df182731a32
SIZE (xrmap/CIA_WDB2.jpd.bz2) = 6750214
MD5 (xrmap/population.dat.bz2) = 0fa2a9b9805f55aa021456bccd4f5281
SIZE (xrmap/population.dat.bz2) = 823796

View file

@ -1,47 +0,0 @@
--- Imakefile.orig Tue Sep 6 22:47:09 2005
+++ Imakefile Thu Oct 27 11:48:43 2005
@@ -15,22 +15,20 @@
DOCHTMLDIR=/X11R6/lib/X11/doc/html
XCOMM Do you want to use the libxpm bug work around ? Comment out if not
-XPMWORKAROUND=-DXPMBUG
XCOMM Default external utilities :
XCOMM PostScript viewer, image viewer, HTML viewer, Print command
XCOMM default editor, MIDI player
-PS_VIEWER="gv -noantialias"
-IM_VIEWER="display -background gray84"
-HTML_VIEWER="dillo"
+PS_VIEWER="gv --noantialias"
+IM_VIEWER="qiv"
+HTML_VIEWER="mozilla"
PRINT_CMD="lpr -Plp"
EDITOR="emx"
MIDIPLAYER="timidity -ig"
XCOMM SVG viewer - select which one you prefer
-XCOMM SVG_VIEWER="xsvg -f"
-SVG_VIEWER="inkview"
+SVG_VIEWER="xsvg -f"
XCOMM Normally -- except for new architectures -- you should be done there.
@@ -62,7 +60,7 @@
XCOMM Solaris, Linux
ZLIBDIR=-L/usr/lib
-CCOPTIONS=-O $(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
+CCOPTIONS=$(XPMWORKAROUND) -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" \
-DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" \
-DSVG_VIEWER=\"$(SVG_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" \
-DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" \
@@ -91,8 +89,6 @@
all::
cd editkit ; xmkmf ; make DESTDIR=$(DESTDIR)
cd earthview ; make DESTDIR=$(DESTDIR)
- strip xrmap ; ls -al xrmap
- @cat EXTRADATA
install:: install.man

View file

@ -1,11 +0,0 @@
--- earthview/Makefile.orig Thu Jul 14 23:16:30 2005
+++ earthview/Makefile Thu Oct 27 11:52:21 2005
@@ -8,7 +8,7 @@
all: earthview
earthview: earthview.c
- gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L/usr/X11R6/lib -lX11 -lm -lz -lbz2
+ $(CC) $(CFLAGS) -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -I$(X11BASE)/include -L$(X11BASE)/lib -lX11 -lm -lz -lbz2
install:
install -c -s earthview $(BINDIR)

View file

@ -1,11 +0,0 @@
--- editkit/Imakefile.orig Tue Sep 6 18:06:13 2005
+++ editkit/Imakefile Thu Oct 27 11:54:22 2005
@@ -23,7 +23,7 @@
XCOMM Compile options:
XCOMM
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
+CFLAGS += -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
LOCAL_LIBRARIES=$(XLIB)
DEPLIBS= # I don't know what I'm doing, and I hate imake!

View file

@ -1,13 +0,0 @@
Xrmap is a small program that can read a custom format of the CIA
world data bank II global vector information to generate images of
the Earth under the X Window system. The images can be very accurately
zoomed in, up to a factor of 100 or more. There is a variety of
options and parameters to control the output of the image, including
the selection of geographic features to be displayed and their
colors. All parameters can be adjusted interactively either from
the builtin command line widget or from the mouse.
WWW: http://frmas.free.fr/li_1.htm
- Pete
petef@FreeBSD.org

File diff suppressed because it is too large Load diff