- Update to 2.32
  - Respect ${CC}, ${CFLAGS}, ${NOPORTDOCS}, ${DOCSDIR} and ${EXAMPLESDIR}
  - Pass maintainership to submitter

Moreover:
  - In order to ensure proper permissions/ownerships/stripping, override the
    vendor install and use ${INSTALL_*} instead
  - Group distfiles by using ${DIST_SUBDIR}

[1]:
PR:		ports/88070
Submitted by:	Serge Gagnon <serge.gagnon@b2b2c.ca> (new maintainer)
This commit is contained in:
Jean-Yves Lefort 2005-10-27 11:11:59 +00:00
parent 3fbea6477d
commit 8e5f24b770
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146469
14 changed files with 5608 additions and 1774 deletions

View file

@ -6,47 +6,88 @@
#
PORTNAME= xrmap
PORTVERSION= 2.29
PORTVERSION= 2.32
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
DISTFILES= ${XRMAPFILE} ${DISTFILE} \
pdfmaps-1.1.tar.gz ${CIAFILE}
EXTRACT_ONLY= ${XRMAPFILE}
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
DIST_SUBDIR= xrmap
EXTRACT_ONLY= ${SRCFILE} ${DATAFILES}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= serge.gagnon@b2b2c.ca
COMMENT= Map portions of the earth from a given longitude/latitude
BROKEN= "distfile outdated, 2.32 is latest"
DEPRECATED= ${BROKEN}
EXPIRATION_DATE= 2005-12-11
USE_BZIP2= yes
USE_IMAKE= yes
MANCOMPRESSED= no
USE_XPM= yes
USE_REINPLACE= yes
XMKMF= xmkmf
MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.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
CIAFILE= CIA_WDB2.jpd.gz
XRMAPFILE= xrmap-${PORTVERSION}.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
MAN1= emx.1 xrmap.1
PORTDOCS= *
MAKE_ARGS= DESTDIR="${PREFIX}"
post-extract:
for f in ${DISTFILE}; do \
${TAR} -jxf ${DISTDIR}/$${f} -C ${WRKSRC}; \
done
${TAR} -zxf ${DISTDIR}/pdfmaps-1.1.tar.gz -C ${WRKSRC}
${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd
@${BZIP2_CMD} -dc ${_DISTDIR}/${CIAFILE} >${WRKDIR}/CIA_WDB2.jpd
@${RM} -f ${WRKDIR}/flags/svg/=
do-configure:
cd ${WRKSRC}; ${XMKMF}; cd ${WRKSRC}/editkit; ${XMKMF}
post-patch:
@${REINPLACE_CMD} -Ee 's|cc |$(CC) $(CFLAGS) |' ${WRKSRC}/tools/Makefile
post-configure:
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile
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,16 +1,18 @@
MD5 (xrmap-2.29.tar.bz2) = 8e0ef89c17aca958d855e8c75dff6ab0
SIZE (xrmap-2.29.tar.bz2) = 1072241
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
SIZE (anthems-1.1.tar.bz2) = 95748
MD5 (factbook_text_2002.tar.bz2) = d28fc69a9fd48d9d39a1fda8099cfb1b
SIZE (factbook_text_2002.tar.bz2) = 699410
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f
SIZE (factbook_html_2002.tar.bz2) = 4321312
MD5 (flags-1.1.tar.bz2) = e15fbfb1f1c8a313573ac499fb0ea090
SIZE (flags-1.1.tar.bz2) = 1199839
MD5 (hymns-1.2.tar.bz2) = b5c1c26e1d5c842c53c9a5460cb02864
SIZE (hymns-1.2.tar.bz2) = 612060
MD5 (pdfmaps-1.1.tar.gz) = 9a40499034f7a98949ab690731eb6e70
SIZE (pdfmaps-1.1.tar.gz) = 26111867
MD5 (CIA_WDB2.jpd.gz) = 5a08415115ef4555aa6ba5e8a19791ec
SIZE (CIA_WDB2.jpd.gz) = 7431144
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

View file

@ -1,95 +1,47 @@
--- 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
--- 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 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 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
@@ -33,18 +34,18 @@
XCOMM HP-UX
XCOMM default editor, MIDI player
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)\"
-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"
#else
XCOMM SVG viewer - select which one you prefer
-XCOMM SVG_VIEWER="xsvg -f"
-SVG_VIEWER="inkview"
+SVG_VIEWER="xsvg -f"
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 Normally -- except for new architectures -- you should be done there.
@@ -62,7 +60,7 @@
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
-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::
strip xrmap ; ls -al xrmap
cd editkit ; xmkmf ; make
cd editkit ; xmkmf ; make DESTDIR=$(DESTDIR)
cd earthview ; make DESTDIR=$(DESTDIR)
- strip xrmap ; ls -al xrmap
- @cat EXTRADATA
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

View file

@ -0,0 +1,11 @@
--- 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,45 +0,0 @@
--- 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 *~

View file

@ -0,0 +1,11 @@
--- 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!

File diff suppressed because it is too large Load diff

View file

@ -6,47 +6,88 @@
#
PORTNAME= xrmap
PORTVERSION= 2.29
PORTVERSION= 2.32
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
DISTFILES= ${XRMAPFILE} ${DISTFILE} \
pdfmaps-1.1.tar.gz ${CIAFILE}
EXTRACT_ONLY= ${XRMAPFILE}
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
DIST_SUBDIR= xrmap
EXTRACT_ONLY= ${SRCFILE} ${DATAFILES}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= serge.gagnon@b2b2c.ca
COMMENT= Map portions of the earth from a given longitude/latitude
BROKEN= "distfile outdated, 2.32 is latest"
DEPRECATED= ${BROKEN}
EXPIRATION_DATE= 2005-12-11
USE_BZIP2= yes
USE_IMAKE= yes
MANCOMPRESSED= no
USE_XPM= yes
USE_REINPLACE= yes
XMKMF= xmkmf
MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.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
CIAFILE= CIA_WDB2.jpd.gz
XRMAPFILE= xrmap-${PORTVERSION}.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
MAN1= emx.1 xrmap.1
PORTDOCS= *
MAKE_ARGS= DESTDIR="${PREFIX}"
post-extract:
for f in ${DISTFILE}; do \
${TAR} -jxf ${DISTDIR}/$${f} -C ${WRKSRC}; \
done
${TAR} -zxf ${DISTDIR}/pdfmaps-1.1.tar.gz -C ${WRKSRC}
${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd
@${BZIP2_CMD} -dc ${_DISTDIR}/${CIAFILE} >${WRKDIR}/CIA_WDB2.jpd
@${RM} -f ${WRKDIR}/flags/svg/=
do-configure:
cd ${WRKSRC}; ${XMKMF}; cd ${WRKSRC}/editkit; ${XMKMF}
post-patch:
@${REINPLACE_CMD} -Ee 's|cc |$(CC) $(CFLAGS) |' ${WRKSRC}/tools/Makefile
post-configure:
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile
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,16 +1,18 @@
MD5 (xrmap-2.29.tar.bz2) = 8e0ef89c17aca958d855e8c75dff6ab0
SIZE (xrmap-2.29.tar.bz2) = 1072241
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
SIZE (anthems-1.1.tar.bz2) = 95748
MD5 (factbook_text_2002.tar.bz2) = d28fc69a9fd48d9d39a1fda8099cfb1b
SIZE (factbook_text_2002.tar.bz2) = 699410
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f
SIZE (factbook_html_2002.tar.bz2) = 4321312
MD5 (flags-1.1.tar.bz2) = e15fbfb1f1c8a313573ac499fb0ea090
SIZE (flags-1.1.tar.bz2) = 1199839
MD5 (hymns-1.2.tar.bz2) = b5c1c26e1d5c842c53c9a5460cb02864
SIZE (hymns-1.2.tar.bz2) = 612060
MD5 (pdfmaps-1.1.tar.gz) = 9a40499034f7a98949ab690731eb6e70
SIZE (pdfmaps-1.1.tar.gz) = 26111867
MD5 (CIA_WDB2.jpd.gz) = 5a08415115ef4555aa6ba5e8a19791ec
SIZE (CIA_WDB2.jpd.gz) = 7431144
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

View file

@ -1,95 +1,47 @@
--- 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
--- 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 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 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
@@ -33,18 +34,18 @@
XCOMM HP-UX
XCOMM default editor, MIDI player
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)\"
-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"
#else
XCOMM SVG viewer - select which one you prefer
-XCOMM SVG_VIEWER="xsvg -f"
-SVG_VIEWER="inkview"
+SVG_VIEWER="xsvg -f"
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 Normally -- except for new architectures -- you should be done there.
@@ -62,7 +60,7 @@
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
-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::
strip xrmap ; ls -al xrmap
cd editkit ; xmkmf ; make
cd editkit ; xmkmf ; make DESTDIR=$(DESTDIR)
cd earthview ; make DESTDIR=$(DESTDIR)
- strip xrmap ; ls -al xrmap
- @cat EXTRADATA
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

View file

@ -0,0 +1,11 @@
--- 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,45 +0,0 @@
--- 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 *~

View file

@ -0,0 +1,11 @@
--- 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!

File diff suppressed because it is too large Load diff