sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

o update xrmap to version 2.29

Browse source 
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

PR:		52491
Submitted by:	Serge Gagnon <gagnon__s@videotron.ca> (maintainer)
This commit is contained in:
Daichi GOTO 2003-06-19 05:52:35 +00:00
parent 8a8f7ea232
commit a6e3c8fa53
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=83290
10 changed files with 164 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
astro/xrmap/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= xrmap PORTNAME= xrmap
PORTVERSION= 2.28 PORTVERSION= 2.29
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \ MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/ ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
@ -21,11 +21,12 @@ USE_BZIP2= yes
USE_IMAKE= yes USE_IMAKE= yes
USE_XPM= yes USE_XPM= yes
USE_REINPLACE= yes USE_REINPLACE= yes
XMKMF= xmkmf
MAN1= xrmap.1 MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.gz CIAFILE= CIA_WDB2.jpd.gz
XRMAPFILE= xrmap-2.28.tar.bz2 XRMAPFILE= xrmap-2.29.tar.bz2
DISTFILE= anthems-1.1.tar.bz2 \ DISTFILE= anthems-1.1.tar.bz2 \
factbook_text_2002.tar.bz2 factbook_html_2002.tar.bz2 \ factbook_text_2002.tar.bz2 factbook_html_2002.tar.bz2 \
flags-1.1.tar.bz2 hymns-1.2.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} ${TAR} -zxf ${DISTDIR}/pdfmaps-1.1.tar.gz -C ${WRKSRC}
${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd ${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd
do-configure:
cd ${WRKSRC}; ${XMKMF}; cd ${WRKSRC}/editkit; ${XMKMF}
post-configure: post-configure:
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile

2
astro/xrmap/distinfo
View file

@ -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 (CIA_WDB2.jpd.gz) = 01f4fcefd5015cd276c2f5952de4f22a
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f

24
astro/xrmap/files/patch-Imakefile
View file

@ -1,5 +1,5 @@
--- Imakefile.orig Sat May 10 09:02:50 2003 --- Imakefile.orig Tue May 20 09:15:57 2003
+++ Imakefile Sat May 10 22:00:54 2003 +++ Imakefile Tue May 20 09:26:51 2003
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
XCOMM Should install to /usr or /usr/local ?? XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr -DESTDIR=/usr
@ -42,7 +42,7 @@
#endif #endif
@@ -62,28 +63,35 @@ @@ -63,31 +64,37 @@
ComplexProgramTarget(xrmap) ComplexProgramTarget(xrmap)
install.man:: install.man::
@ -53,7 +53,7 @@
all:: all::
strip xrmap ; ls -al xrmap strip xrmap ; ls -al xrmap
cd editkit ; make emx cd editkit ; xmkmf ; make
install:: install.man install:: install.man
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR) - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
@ -67,6 +67,9 @@
cd themes ; rm -f *~ cd themes ; rm -f *~
- cp -fR themes $(DESTDIR)$(SHAREDIR) - cp -fR themes $(DESTDIR)$(SHAREDIR)
+ cp -fR themes $(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 cd i18n ; rm -f *~ ; fi
- if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi - if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags
@ -80,12 +83,13 @@
+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi + if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
+ if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi + if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi
+ if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi + if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi
+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
+ $(MKDIRHIER) $(SHAREDIR)/doc + $(MKDIRHIER) $(SHAREDIR)/doc
cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP WARNING \ cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP WARNING \
- midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc - EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
- cd examples ; cp -f * $(DESTDIR)$(SHAREDIR)/doc + EXAMPLE.rc midi_cfg/README.midi $(SHAREDIR)/doc
+ midi_cfg/README.midi $(SHAREDIR)/doc cd rc ; rm -f *~
+ cd examples ; cp -f * $(SHAREDIR)/doc - cp -fR rc $(DESTDIR)$(SHAREDIR)
cd editkit ; make install + cp -fR rc $(SHAREDIR)
cd editkit ; xmkmf ; make install
cat WARNING cat WARNING

55
astro/xrmap/files/patch-editkit-Imakfile
View file

@ -1,16 +1,45 @@
--- editkit/Makefile.orig Wed Apr 30 09:24:13 2003 --- editkit/Imakefile.orig Sun May 18 15:41:24 2003
+++ editkit/Makefile Wed Apr 30 09:26:32 2003 +++ editkit/Imakefile Tue May 20 12:44:02 2003
@@ -12,10 +12,11 @@ @@ -1,14 +1,16 @@
# TWOBUTN paste with button3 click, set selection with button3 drag XCOMM Should install to /usr or /usr/local ??
# MINIMAL to remove bak files, /usr/share/edmtx and e**rc -DESTDIR=/usr
# TLL for Terry Loveall personal settings +DESTDIR=
+PREFIX=/usr/X11R6 +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 +SHARE_DIR=$(PREFIX)/share/editkit
+INCLUDES=-I$(PREFIX)/include
-SHARE_DIR=/usr/share/editkit XCOMM
- XCOMM Normally -- except for new architectures -- you should be done there.
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\"" @@ -17,7 +19,7 @@
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\"" XCOMM Compile options:
XCOMM
#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL -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 *~

32
astro/xrmap/pkg-plist
View file

@ -1,6 +1,5 @@
bin/emx bin/emx
bin/xrmap bin/xrmap
share/editkit/MANUAL.emacs
share/editkit/README share/editkit/README
share/editkit/emxrc share/editkit/emxrc
share/editkit/rc.common share/editkit/rc.common
@ -201,17 +200,14 @@ share/rmap/anthems/yu.ant
share/rmap/anthems/za.ant share/rmap/anthems/za.ant
share/rmap/anthems/zm.ant share/rmap/anthems/zm.ant
share/rmap/anthems/zw.ant share/rmap/anthems/zw.ant
share/rmap/doc/Asia.rc
share/rmap/doc/CHANGES share/rmap/doc/CHANGES
share/rmap/doc/EXAMPLE.rc share/rmap/doc/EXAMPLE.rc
share/rmap/doc/Europe.rc
share/rmap/doc/INSTALL share/rmap/doc/INSTALL
share/rmap/doc/LICENSE share/rmap/doc/LICENSE
share/rmap/doc/MAPEDIT share/rmap/doc/MAPEDIT
share/rmap/doc/README share/rmap/doc/README
share/rmap/doc/README.midi share/rmap/doc/README.midi
share/rmap/doc/TODO share/rmap/doc/TODO
share/rmap/doc/USA.rc
share/rmap/doc/VECTORMAP share/rmap/doc/VECTORMAP
share/rmap/doc/WARNING share/rmap/doc/WARNING
share/rmap/factbook/countrylisting.html share/rmap/factbook/countrylisting.html
@ -2584,22 +2580,32 @@ share/rmap/picons/unix.xpm
share/rmap/picons/visacard.xpm share/rmap/picons/visacard.xpm
share/rmap/picons/wheel.xpm share/rmap/picons/wheel.xpm
share/rmap/picons/win.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/macros.ps
share/rmap/postscript/private.ps share/rmap/postscript/private.ps
share/rmap/themes/buttons/b0.xpm.gz share/rmap/rc/Africa.rc
share/rmap/themes/buttons/b1.xpm.gz share/rmap/rc/Asia.rc
share/rmap/themes/buttons/b2.xpm.gz 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/cloudy
share/rmap/themes/coffee share/rmap/themes/coffee
share/rmap/themes/default 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 share/rmap/themes/sea
@dirrm share/rmap/themes/optional @dirrm share/rmap/rc
@dirrm share/rmap/themes/buttons
@dirrm share/rmap/themes @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/postscript
@dirrm share/rmap/picons @dirrm share/rmap/picons
@dirrm share/rmap/pdfmaps @dirrm share/rmap/pdfmaps

8
misc/xrmap/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= xrmap PORTNAME= xrmap
PORTVERSION= 2.28 PORTVERSION= 2.29
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \ MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/ ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
@ -21,11 +21,12 @@ USE_BZIP2= yes
USE_IMAKE= yes USE_IMAKE= yes
USE_XPM= yes USE_XPM= yes
USE_REINPLACE= yes USE_REINPLACE= yes
XMKMF= xmkmf
MAN1= xrmap.1 MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.gz CIAFILE= CIA_WDB2.jpd.gz
XRMAPFILE= xrmap-2.28.tar.bz2 XRMAPFILE= xrmap-2.29.tar.bz2
DISTFILE= anthems-1.1.tar.bz2 \ DISTFILE= anthems-1.1.tar.bz2 \
factbook_text_2002.tar.bz2 factbook_html_2002.tar.bz2 \ factbook_text_2002.tar.bz2 factbook_html_2002.tar.bz2 \
flags-1.1.tar.bz2 hymns-1.2.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} ${TAR} -zxf ${DISTDIR}/pdfmaps-1.1.tar.gz -C ${WRKSRC}
${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd ${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd
do-configure:
cd ${WRKSRC}; ${XMKMF}; cd ${WRKSRC}/editkit; ${XMKMF}
post-configure: post-configure:
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile ${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/editkit/Makefile

2
misc/xrmap/distinfo
View file

@ -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 (CIA_WDB2.jpd.gz) = 01f4fcefd5015cd276c2f5952de4f22a
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f

24
misc/xrmap/files/patch-Imakefile
View file

@ -1,5 +1,5 @@
--- Imakefile.orig Sat May 10 09:02:50 2003 --- Imakefile.orig Tue May 20 09:15:57 2003
+++ Imakefile Sat May 10 22:00:54 2003 +++ Imakefile Tue May 20 09:26:51 2003
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
XCOMM Should install to /usr or /usr/local ?? XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr -DESTDIR=/usr
@ -42,7 +42,7 @@
#endif #endif
@@ -62,28 +63,35 @@ @@ -63,31 +64,37 @@
ComplexProgramTarget(xrmap) ComplexProgramTarget(xrmap)
install.man:: install.man::
@ -53,7 +53,7 @@
all:: all::
strip xrmap ; ls -al xrmap strip xrmap ; ls -al xrmap
cd editkit ; make emx cd editkit ; xmkmf ; make
install:: install.man install:: install.man
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR) - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
@ -67,6 +67,9 @@
cd themes ; rm -f *~ cd themes ; rm -f *~
- cp -fR themes $(DESTDIR)$(SHAREDIR) - cp -fR themes $(DESTDIR)$(SHAREDIR)
+ cp -fR themes $(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 cd i18n ; rm -f *~ ; fi
- if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi - if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags
@ -80,12 +83,13 @@
+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi + if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
+ if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi + if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi
+ if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi + if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi
+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
+ $(MKDIRHIER) $(SHAREDIR)/doc + $(MKDIRHIER) $(SHAREDIR)/doc
cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP WARNING \ cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP WARNING \
- midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc - EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
- cd examples ; cp -f * $(DESTDIR)$(SHAREDIR)/doc + EXAMPLE.rc midi_cfg/README.midi $(SHAREDIR)/doc
+ midi_cfg/README.midi $(SHAREDIR)/doc cd rc ; rm -f *~
+ cd examples ; cp -f * $(SHAREDIR)/doc - cp -fR rc $(DESTDIR)$(SHAREDIR)
cd editkit ; make install + cp -fR rc $(SHAREDIR)
cd editkit ; xmkmf ; make install
cat WARNING cat WARNING

55
misc/xrmap/files/patch-editkit-Imakfile
View file

@ -1,16 +1,45 @@
--- editkit/Makefile.orig Wed Apr 30 09:24:13 2003 --- editkit/Imakefile.orig Sun May 18 15:41:24 2003
+++ editkit/Makefile Wed Apr 30 09:26:32 2003 +++ editkit/Imakefile Tue May 20 12:44:02 2003
@@ -12,10 +12,11 @@ @@ -1,14 +1,16 @@
# TWOBUTN paste with button3 click, set selection with button3 drag XCOMM Should install to /usr or /usr/local ??
# MINIMAL to remove bak files, /usr/share/edmtx and e**rc -DESTDIR=/usr
# TLL for Terry Loveall personal settings +DESTDIR=
+PREFIX=/usr/X11R6 +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 +SHARE_DIR=$(PREFIX)/share/editkit
+INCLUDES=-I$(PREFIX)/include
-SHARE_DIR=/usr/share/editkit XCOMM
- XCOMM Normally -- except for new architectures -- you should be done there.
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\"" @@ -17,7 +19,7 @@
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\"" XCOMM Compile options:
XCOMM
#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL -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 *~

32
misc/xrmap/pkg-plist
View file

@ -1,6 +1,5 @@
bin/emx bin/emx
bin/xrmap bin/xrmap
share/editkit/MANUAL.emacs
share/editkit/README share/editkit/README
share/editkit/emxrc share/editkit/emxrc
share/editkit/rc.common share/editkit/rc.common
@ -201,17 +200,14 @@ share/rmap/anthems/yu.ant
share/rmap/anthems/za.ant share/rmap/anthems/za.ant
share/rmap/anthems/zm.ant share/rmap/anthems/zm.ant
share/rmap/anthems/zw.ant share/rmap/anthems/zw.ant
share/rmap/doc/Asia.rc
share/rmap/doc/CHANGES share/rmap/doc/CHANGES
share/rmap/doc/EXAMPLE.rc share/rmap/doc/EXAMPLE.rc
share/rmap/doc/Europe.rc
share/rmap/doc/INSTALL share/rmap/doc/INSTALL
share/rmap/doc/LICENSE share/rmap/doc/LICENSE
share/rmap/doc/MAPEDIT share/rmap/doc/MAPEDIT
share/rmap/doc/README share/rmap/doc/README
share/rmap/doc/README.midi share/rmap/doc/README.midi
share/rmap/doc/TODO share/rmap/doc/TODO
share/rmap/doc/USA.rc
share/rmap/doc/VECTORMAP share/rmap/doc/VECTORMAP
share/rmap/doc/WARNING share/rmap/doc/WARNING
share/rmap/factbook/countrylisting.html share/rmap/factbook/countrylisting.html
@ -2584,22 +2580,32 @@ share/rmap/picons/unix.xpm
share/rmap/picons/visacard.xpm share/rmap/picons/visacard.xpm
share/rmap/picons/wheel.xpm share/rmap/picons/wheel.xpm
share/rmap/picons/win.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/macros.ps
share/rmap/postscript/private.ps share/rmap/postscript/private.ps
share/rmap/themes/buttons/b0.xpm.gz share/rmap/rc/Africa.rc
share/rmap/themes/buttons/b1.xpm.gz share/rmap/rc/Asia.rc
share/rmap/themes/buttons/b2.xpm.gz 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/cloudy
share/rmap/themes/coffee share/rmap/themes/coffee
share/rmap/themes/default 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 share/rmap/themes/sea
@dirrm share/rmap/themes/optional @dirrm share/rmap/rc
@dirrm share/rmap/themes/buttons
@dirrm share/rmap/themes @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/postscript
@dirrm share/rmap/picons @dirrm share/rmap/picons
@dirrm share/rmap/pdfmaps @dirrm share/rmap/pdfmaps