- Update to 1.0.6

PR:		ports/66903 (based on)
Submitted by:	Roman Neuhauser <neuhauser@chello.cz>
Approved by:	maintainer timeout (2 weeks)
This commit is contained in:
Pav Lucistnik 2004-06-06 22:43:49 +00:00
parent 62973de8dd
commit 8294db3dfd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=110965
5 changed files with 62 additions and 55 deletions

View File

@ -6,41 +6,40 @@
#
PORTNAME= roadmap
PORTVERSION= 1.0.r6
PORTREVISION= 1
PORTVERSION= 1.0.6
CATEGORIES= astro
MASTER_SITES= http://roadmap.saignon.net/roadmap/
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}_1_0rc6_src
MASTER_SITES= http://roadmap.digitalomaha.net/roadmap/
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src
MAINTAINER= nick@netdot.net
COMMENT= Vector-based GPS moving map
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
sqlite.2:${PORTSDIR}/databases/sqlite
WRKSRC= ${WRKDIR}/${PORTNAME}
BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${WRKSRC}/src
USE_GNOME= gtk12
USE_GMAKE=yes
USE_GMAKE= yes
USE_X_PREFIX= yes
BINS= buildmap buildus dumpmap
GUI_BINS= gtkroadmap gtkroadgps
SCRIPTS= rdmdownload rdmgetall rdmgenmaps rdmcompare
DATA= sprites preferences schema
DOCS= AUTHORS BUGS COPYING README TODO
PORTDOCS= AUTHORS BUGS README TODO
do-install:
.for _GUI_BIN in ${GUI_BINS}
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk/${_GUI_BIN} ${X11BASE}/bin/${_GUI_BIN}
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk/${_GUI_BIN} ${PREFIX}/bin/${_GUI_BIN}
.endfor
.for _BIN in ${BINS}
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${LOCALBASE}/bin/${_BIN}
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${PREFIX}/bin/${_BIN}
.endfor
.for _SCRIPT in ${SCRIPTS}
${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${LOCALBASE}/bin/${_BIN}
${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${PREFIX}/bin/${_BIN}
.endfor
${MKDIR} ${DATADIR}
.for _DATA in ${DATA}
@ -48,7 +47,7 @@ do-install:
.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for _DOC in ${DOCS}
.for _DOC in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${_DOC} ${DOCSDIR}/${_DOC}
.endfor
.endif

View File

@ -1,2 +1,2 @@
MD5 (roadmap_1_0rc6_src.tar.gz) = f983f17a45feb573975cde0748629044
SIZE (roadmap_1_0rc6_src.tar.gz) = 213971
MD5 (roadmap_1_0_6_src.tar.gz) = 1549975dd112127aff018dd430870037
SIZE (roadmap_1_0_6_src.tar.gz) = 276634

View File

@ -1,5 +1,5 @@
--- src/gtk/Makefile.orig Sun May 11 22:23:11 2003
+++ src/gtk/Makefile Mon Jun 30 22:51:16 2003
--- src/gtk/Makefile.orig Tue May 25 07:28:15 2004
+++ src/gtk/Makefile Mon Jun 7 00:25:58 2004
@@ -1,12 +1,12 @@
-GUICFLAGS=`gtk-config --cflags`
@ -7,15 +7,15 @@
+GUICFLAGS=`${GTK_CONFIG} --cflags`
+GUILDFLAGS=`${GTK_CONFIG} --libs`
-STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
+STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
-STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -g -Wall
+STDCFLAGS=-ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
# STDCFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
# STDCFLAGS=-g -Wall -pg -fprofile-arcs -g
-CFLAGS=$(STDCFLAGS) $(GUICFLAGS) -I..
+CFLAGS+=$(STDCFLAGS) $(GUICFLAGS) -I..
RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a
RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a ../libroadmap.a
LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm
@@ -24,7 +24,7 @@

View File

@ -1,30 +1,46 @@
--- src/Makefile.orig Mon Jun 2 23:09:02 2003
+++ src/Makefile Mon Jun 30 22:53:43 2003
@@ -1,12 +1,12 @@
--- src/Makefile.orig Tue May 25 08:36:00 2004
+++ src/Makefile Mon Jun 7 00:36:22 2004
@@ -10,7 +10,7 @@
MODECFLAGS=-g -Wall -pg -fprofile-arcs -g
MODELDFLAGS=-pg
else
- MODECFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall $(OPTIONS)
+ MODECFLAGS=-ffast-math -fomit-frame-pointer -Wall $(OPTIONS) -I${LOCALBASE}/include
MODELDFLAGS=
endif
endif
@@ -20,17 +20,17 @@
SQLLDFLAGS=
SQLTOOLS=
else
- SQLCFLAGS=-DROADMAP_USES_SQLITE
- SQLLDFLAGS=-lsqlite
+ SQLCFLAGS=-DROADMAP_USES_SQLITE -I${LOCALBASE}/include
+ SQLLDFLAGS=-lsqlite -L${LOCALBASE}/lib
SQLTOOLS=sqliteload
endif
-CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
+CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
# CFLAGS=-g -Wall
# CFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
# CFLAGS=-g -Wall -pg -fprofile-arcs -g
-CFLAGS=$(MODECFLAGS) $(SQLCFLAGS)
+CFLAGS+=$(MODECFLAGS) $(SQLCFLAGS)
LDFLAGS=$(MODELDFLAGS) $(SQLLDFLAGS)
TOOLS=sunrise $(SQLTOOLS)
RDMLIBS=libroadmap.a unix/libosroadmap.a
-LIBS=$(RDMLIBS) -lpopt -lm
+LIBS=$(RDMLIBS) -lpopt -lm -L${LOCALBASE}/lib
# LDFLAGS=-pg $(LDFLAGS)
@@ -98,7 +98,7 @@
@@ -133,7 +133,7 @@
SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare
RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a
RUNTIME=$(RDMLIBS) libguiroadgps.a libguiroadmap.a
-INSTALLDIR=/usr/local
+INSTALLDIR=${LOCALBASE}
+INSTALLDIR=${PREFIX}
# --- Conventional targets ----------------------------------------
@@ -114,10 +114,10 @@
@@ -149,10 +149,10 @@
strip -s $(BUILD)
clean: cleanone
@ -39,28 +55,28 @@
cleanone:
rm -f *.o *.a *.da $(BUILD)
@@ -138,14 +138,14 @@
@@ -168,7 +168,7 @@
cd $(INSTALLDIR)/bin ; chmod a+x $(BUILD) $(SCRIPTS)
if [ -d /usr/lib/menu ] ; then cp roadmap.menu /usr/lib/menu/roadmap; fi
mkdir -p $(INSTALLDIR)/share/pixmaps
- cd icons ; make ICONDIR="$(INSTALLDIR)/share/pixmaps" install
+ cd icons ; ${MAKE} ICONDIR="$(INSTALLDIR)/share/pixmaps" install
cp -f roadmap*.png $(INSTALLDIR)/share/pixmaps
cp -f roadmap.desktop $(INSTALLDIR)/applications
@@ -178,9 +178,7 @@
rm -f /usr/lib/menu/roadmap
everything: build
everything: runtime build icons $(TOOLS)
- cd gtk ; make STDCFLAGS="$(CFLAGS)" all
- cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all
- cd qt ; make STDCFLAGS="$(CFLAGS)" all
+ cd gtk ; ${MAKE} STDCFLAGS="$(CFLAGS)" all
+# cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all
+# cd qt ; make STDCFLAGS="$(CFLAGS)" all
cleanall:
cd gtk ; make clean
- cd gtk2 ; make clean
- cd qt ; make clean
+# cd gtk2 ; make clean
+# cd qt ; make clean
rebuild: cleanall everything
@@ -161,7 +161,7 @@
ar rf libguiroadgps.a $(RGGUIOBJS)
@@ -207,7 +205,7 @@
$(AR) rf libguiroadgps.a $(RGGUIOBJS)
unix/libosroadmap.a:
- cd unix; make "CFLAGS=$(CFLAGS) -I.."

View File

@ -1,10 +1,8 @@
@cwd %%X11BASE%%
bin/gtkroadmap
bin/gtkroadgps
@exec ln -sf %D/bin/gtkroadmap %D/bin/roadmap
@exec ln -sf %D/bin/gtkroadgps %D/bin/roadgps
@unexec rm -f %D/bin/roadmap %D/bin/roadgps 2>&1 >/dev/null || true
@cwd %%LOCALBASE%%
bin/buildmap
bin/buildus
bin/dumpmap
@ -15,10 +13,4 @@ bin/rdmcompare
%%DATADIR%%/preferences
%%DATADIR%%/schema
%%DATADIR%%/sprites
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%