- Resolve conflict with devel/ruby-gems: bin/gem is installed by these two

ports. As ruby-gems is more popular, change grass's gem to
  grass%%VER%%-gem. [1,2]
- Use LOCALBASE/bin/bash instead of /bin/bash in some shell scripts [2,3]
- Add supports for ODBC and SQLite in OPTIONS (default off) [2]
- Bump PORTREVISION

PR:		ports/115818 [1], ports/121919 [2,3]
Reported by:	Chris Calvey <chris at infosec.yi.org> [1],
	 	Sajo Zsolt Attila <sajozsattila at citromail.hu> [3]
Submitted by:	TAOKA Fumiyoshi <fmysh at iijmio-mail.jp> [2]
Approved by:	maintainer timeout (2 weeks)
This commit is contained in:
Rong-En Fan 2008-04-04 06:26:39 +00:00
parent 34c68566ed
commit d723f51c5d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=210475
2 changed files with 51 additions and 11 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= grass
PORTVERSION= 6.2.3
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= databases geography
MASTER_SITES= http://grass.itc.it/grass62/source/ \
@ -28,7 +29,8 @@ COMMENT= An open source Geographical Information System (GIS)
BUILD_DEPENDS= proj:${PORTSDIR}/graphics/proj \
gdal-config:${PORTSDIR}/graphics/gdal
RUN_DEPENDS= proj:${PORTSDIR}/graphics/proj \
gdal-config:${PORTSDIR}/graphics/gdal
gdal-config:${PORTSDIR}/graphics/gdal \
bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@ -61,14 +63,21 @@ CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \
--with-nls \
--with-cxx \
--with-readline \
--with-curses \
--enable-largefile
PLIST_SUB= GRASS_INST_DIR=${GRASS_INST_DIR} \
VERSION=${PORTVERSION}
VERSION=${PORTVERSION} \
VER=${PORTVERSION:R:C/\.//}
USE_LDCONFIG= ${PREFIX}/${GRASS_INST_DIR}/lib
OPTIONS= MYSQL "Enable MySQL support" Off \
PGSQL "Enable PostgreSQL support" On
OPTIONS= MYSQL "Enable MySQL support" Off \
ODBC "Enable ODBC support" Off \
PGSQL "Enable PostgreSQL support" On \
SQLITE "Enable SQLite support" Off
BASH_SCRIPTS= i.spectral r.mapcalculator r.tileset r3.mapcalculator \
v.in.gpsbabel
.include <bsd.port.pre.mk>
@ -85,6 +94,15 @@ PLIST_SUB+= MYSQL=""
.else
PLIST_SUB+= MYSQL="@comment "
.endif
.if defined(WITH_ODBC)
LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
CONFIGURE_ARGS+=--with-odbc
PLIST_SUB+= ODBC=""
.else
PLIST_SUB+= ODBC="@comment "
.endif
.if defined(WITHOUT_PGSQL)
CONFIGURE_ARGS+=--without-postgres
PLIST_SUB+= PGSQL="@comment "
@ -93,8 +111,20 @@ USE_PGSQL= yes
PLIST_SUB+= PGSQL=""
.endif
post-extract:
@${REINPLACE_CMD} -E '/^INST_DIR=/s|/grass-.*|/${GRASS_INST_DIR}|g' \
${WRKSRC}/Makefile
.if defined(WITH_SQLITE)
USE_SQLITE= yes
CONFIGURE_ARGS+=--with-sqlite
PLIST_SUB+= SQLITE=""
.else
PLIST_SUB+= SQLITE="@comment "
.endif
post-patch:
@${REINPLACE_CMD} -e "/^INST_DIR=/s|grass-.*|${GRASS_INST_DIR}|" \
${WRKSRC}/Makefile
.for s in ${BASH_SCRIPTS}
@${REINPLACE_CMD} -e "1s|/bin/bash|${LOCALBASE}/bin/bash|" \
${WRKSRC}/scripts/$s/$s
.endfor
.include <bsd.port.post.mk>

View File

@ -1,5 +1,5 @@
bin/gem
bin/grass62
bin/grass%%VER%%
bin/grass%%VER%%-gem
%%GRASS_INST_DIR%%/bin/bmif_to_cell
%%GRASS_INST_DIR%%/bin/d.ask
%%GRASS_INST_DIR%%/bin/d.barscale
@ -466,7 +466,11 @@ bin/grass62
%%GRASS_INST_DIR%%/docs/html/g.version.html
%%GRASS_INST_DIR%%/docs/html/gis.m.html
%%GRASS_INST_DIR%%/docs/html/grass-dbf.html
%%GRASS_INST_DIR%%/docs/html/grass-pg.html
%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mesql.html
%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mysql.html
%%ODBC%%%%GRASS_INST_DIR%%/docs/html/grass-odbc.html
%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/grass-pg.html
%%SQLITE%%%%GRASS_INST_DIR%%/docs/html/grass-sqlite.html
%%GRASS_INST_DIR%%/docs/html/grass6.html
%%GRASS_INST_DIR%%/docs/html/grass_logo.txt
%%GRASS_INST_DIR%%/docs/html/helptext.html
@ -962,8 +966,10 @@ bin/grass62
%%GRASS_INST_DIR%%/driver/XDRIVER
%%GRASS_INST_DIR%%/driver/db/dbf
%%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
%%ODBC%%%%GRASS_INST_DIR%%/driver/db/odbc
%%GRASS_INST_DIR%%/driver/db/ogr
%%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
%%SQLITE%%%%GRASS_INST_DIR%%/driver/db/sqlite
%%GRASS_INST_DIR%%/etc/BUILD
%%GRASS_INST_DIR%%/etc/FIPS.code
%%GRASS_INST_DIR%%/etc/Init.sh
@ -1799,7 +1805,11 @@ bin/grass62
%%GRASS_INST_DIR%%/man/man1/g.version.1
%%GRASS_INST_DIR%%/man/man1/gis.m.1
%%GRASS_INST_DIR%%/man/man1/grass-dbf.1
%%GRASS_INST_DIR%%/man/man1/grass-pg.1
%%MYSQL%%%%GRASS_INST_DIR%%/man/man1/grass-mesql.1
%%MYSQL%%%%GRASS_INST_DIR%%/man/man1/grass-mysql.1
%%ODBC%%%%GRASS_INST_DIR%%/man/man1/grass-odbc.1
%%PGSQL%%%%GRASS_INST_DIR%%/man/man1/grass-pg.1
%%SQLITE%%%%GRASS_INST_DIR%%/man/man1/grass-sqlite.1
%%GRASS_INST_DIR%%/man/man1/grass6.1
%%GRASS_INST_DIR%%/man/man1/helptext.1
%%GRASS_INST_DIR%%/man/man1/i.ask.1