Index: head/databases/grass-i18n/Makefile =================================================================== --- head/databases/grass-i18n/Makefile (revision 182591) +++ head/databases/grass-i18n/Makefile (revision 182592) @@ -1,135 +1,146 @@ # New ports collection makefile for: grass-i18n # Date created: 20 Aug 2004 # Whom: hrs # # $FreeBSD$ PORTNAME= grass-i18n PORTVERSION= 5.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.grass-japan.org/FOSS4G/GRASS/:grass \ http://www.grass-japan.org/FOSS4G/ipafonts/:ipafonts PKGNAMESUFFIX= +ipafont DISTFILES= ${FILES_SRC}:grass ${FILES_TKI18N}:grass ${FILES_FONTS}:ipafonts EXTRACT_ONLY= ${FILES_SRC} MAINTAINER= hrs@FreeBSD.org COMMENT= An open source Geographical Information System (GIS), i18n version LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gd.4:${PORTSDIR}/graphics/gd \ fftw.2:${PORTSDIR}/math/fftw \ freetype.9:${PORTSDIR}/print/freetype2 \ gdbm.3:${PORTSDIR}/databases/gdbm \ - lapack.3:${PORTSDIR}/math/lapack + blas.2:${PORTSDIR}/math/blas \ + lapack.4:${PORTSDIR}/math/lapack CONFLICTS= grass-[0-9]* +WANT_FORTRAN= yes #dummy but future use +BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 +FC= gfortran42 +F77= gfortran42 +CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" +FORTRANLIBS= -lgfortranbegin -lgfortran +GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. + FILES_SRC= grass${PORTVERSION}_i18n_src${EXTRACT_SUFX} FILES_TKI18N= tcltkgrass-i18n${EXTRACT_SUFX} FILES_FONTS= grass${PORTVERSION}_i686-pc-linux-i18n-ipafull-gnu_bin${EXTRACT_SUFX} .if defined(WITH_POSTGRES) USE_PGSQL= yes LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-postgres \ --with-postgres-includes=${LOCALBASE}/include/postgresql/internal/ \ --with-odbc PLIST_SUB+= POSTGRES="" .else CONFIGURE_ARGS+=--without-postgres \ --without-odbc PLIST_SUB+= POSTGRES="@comment " .endif .if defined(WITH_TCLTK) BUILD_DEPENDS+= tclsh8.3:${PORTSDIR}/lang/tcl83 \ wish8.3:${PORTSDIR}/x11-toolkits/tk83 RUN_DEPENDS+= tclsh8.3:${PORTSDIR}/lang/tcl83 \ wish8.3:${PORTSDIR}/x11-toolkits/tk83 CONFIGURE_ARGS+=--with-tcltk \ --with-tcltk-includes="${LOCALBASE}/include/tcl8.3 \ ${LOCALBASE}/include/tk8.3" PLIST_SUB+= TCLTK="" .else CONFIGURE_ARGS+=--without-tcltk PLIST_SUB+= TCLTK="@comment " .endif EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude *CVS* WRKSRC= ${WRKDIR}/grass-${PORTVERSION}-i18n USE_ICONV= yes USE_XLIB= yes USE_GL= yes USE_PERL5= yes USE_BISON= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:213 CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \ --with-libs=${LOCALBASE}/lib \ --with-opengl-includes=${X11BASE}/include \ --with-opengl-libs=${X11BASE}/lib \ --with-freetype \ --with-freetype-includes=${LOCALBASE}/include/freetype2 \ --with-blas \ --with-lapack \ --with-nls \ --without-motif CONFIGURE_IN_SUB= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} .include pre-extract: @${ECHO_CMD} "You can specify the following build options:" @${ECHO_CMD} " WITH_POSTGRES=YES: build with PostgreSQL support" @${ECHO_CMD} " WITH_TCLTK=YES: build with TclTk support" @${ECHO_CMD} "" post-extract: cd ${WRKDIR} && ${TAR} xzf \ ${DISTDIR}/${FILES_FONTS} ./fonts/\*.ttf ./license-ipafonts.eucjp ${MKDIR} ${WRKDIR}/tcltkgrass-i18n cd ${WRKDIR}/tcltkgrass-i18n && ${TAR} xzf \ ${DISTDIR}/${FILES_TKI18N} if [ `${ID} -u` = 0 ]; then \ ${CHMOD} -R ug-s ${WRKDIR}/tcltkgrass-i18n; \ ${CHOWN} -R 0:0 ${WRKDIR}/tcltkgrass-i18n; \ fi ${RM} -rf `${FIND} ${WRKDIR}/tcltkgrass-i18n -type d -a -name cvs` .for D in docs main module script ${MV} ${WRKSRC}/src/tcltkgrass/${D} ${WRKSRC}/src/tcltkgrass/${D}.orig ${MV} ${WRKDIR}/tcltkgrass-i18n/tcltkgrass-i18n/${D} ${WRKSRC}/src/tcltkgrass/${D} .endfor post-patch: + ${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR ${CP} ${WRKSRC}/configure.in ${WRKSRC}/configure.in.orig ${SED} ${CONFIGURE_IN_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ < ${WRKSRC}/configure.in.orig \ > ${WRKSRC}/configure.in + ${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" -e "s+%%FORTRANLIBS%%+${FORTRANLIBS}+" ${WRKSRC}/configure.in post-install: cd ${WRKDIR}/tcltkgrass-i18n/scripts && ${TAR} cf - . | \ (cd ${PREFIX}/grass5/scripts && ${TAR} xf -) .if defined(WITH_TCLTK) cd ${WRKDIR}/tcltkgrass-i18n/bin && ${TAR} cf - . | \ (cd ${PREFIX}/grass5/bin && ${TAR} xf -) cd ${WRKDIR}/tcltkgrass-i18n/etc && ${TAR} cf - ./nviz2.2-i18n | \ (cd ${PREFIX}/grass5/etc && ${TAR} xf -) cd ${WRKDIR}/tcltkgrass-i18n/documents && ${TAR} cf - ./nviz | \ (cd ${PREFIX}/grass5/documents && ${TAR} xf -) .endif ${INSTALL_DATA} ${WRKDIR}/fonts/*.ttf \ ${WRKDIR}/license-ipafonts.eucjp \ ${PREFIX}/grass5/fonts/ -(cd ${PREFIX} && ${GREP} -v "@" ${PLIST} | \ ${XARGS} ${STRIP_CMD} 2> /dev/null || ${TRUE}) .include Property changes on: head/databases/grass-i18n/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.37 \ No newline at end of property +1.38 \ No newline at end of property Index: head/databases/grass-i18n/files/patch-configure.in =================================================================== --- head/databases/grass-i18n/files/patch-configure.in (revision 182591) +++ head/databases/grass-i18n/files/patch-configure.in (revision 182592) @@ -1,49 +1,78 @@ --- configure.in.orig Sun Mar 16 18:25:19 2003 +++ configure.in Sun Jul 11 17:55:03 2004 @@ -295,7 +295,7 @@ AC_MSG_ERROR([*** You must supply a directory list to --with-libs.]) ;; esac -AC_MSG_RESULT($LIBRARY_DIRS) +AC_MSG_RESULT($with_libs) if test -n "$with_libs"; then for dir in $with_libs; do @@ -502,7 +502,7 @@ LOC_CHECK_INC_PATH(dbm,DBM,DBMINCPATH) -LOC_CHECK_INCLUDES(dbm.h,DBM,$DBMINCPATH) +LOC_CHECK_INCLUDES(gdbm.h,DBM,$DBMINCPATH) # With DBM library directory @@ -842,7 +842,7 @@ LOC_CHECK_LIB_PATH(opengl,OpenGL,OPENGL_LIB_PATH) -LOC_CHECK_LIBS(GL,glBegin,OpenGL,$OPENGL_LIB_PATH,OPENGLLIB,$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-lpthread) +LOC_CHECK_LIBS(GL,glBegin,OpenGL,$OPENGL_LIB_PATH,OPENGLLIB,$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-pthread -lXext) LOC_CHECK_LIBS(GLU,gluBeginCurve,GLU,$OPENGL_LIB_PATH,OPENGLULIB,$OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-lstdc++) @@ -862,8 +862,8 @@ LOC_CHECK_USE(odbc,ODBC,USE_ODBC) -ODBCINC= -ODBCLIB= +ODBCINC=%%PTHREAD_CFLAGS%% +ODBCLIB=%%PTHREAD_LIBS%% if test -n "$USE_ODBC"; then @@ -1054,7 +1054,7 @@ LOC_CHECK_INC_PATH(freetype,FreeType,FTINC) -LOC_CHECK_INCLUDES(freetype/freetype.h,FreeType,$FTINC) +LOC_CHECK_INCLUDES(ft2build.h,FreeType,$FTINC) # With FreeType library directory +--- configure.in~ Wed Jan 17 14:41:52 2007 ++++ configure.in Wed Jan 17 14:52:32 2007 +@@ -335,7 +335,7 @@ + AC_CHECK_PROGS(F77, g77 f77) + AC_PATH_PROG(PERL, perl, no) + AC_HEADER_STDC +-AC_CHECK_HEADERS(curses.h limits.h termio.h termios.h unistd.h values.h g2c.h f2c.h) ++AC_CHECK_HEADERS(curses.h limits.h termio.h termios.h unistd.h values.h) + AC_CHECK_HEADERS(sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h) + AC_CHECK_HEADERS(sys/timeb.h sys/types.h sys/utsname.h) + AC_CHECK_HEADERS(libintl.h iconv.h) +@@ -934,7 +934,7 @@ + + LOC_CHECK_LIB_PATH(blas,BLAS,BLASLIB) + +-LOC_CHECK_LIBS(blas,dnrm2_,BLAS,$BLASLIB,BLASLIB,$MATHLIB,,,-lg2c) ++LOC_CHECK_LIBS(blas,dnrm2_,BLAS,$BLASLIB,BLASLIB,$MATHLIB,,,%%GCCLIBDIR%% %%FORTRANLIBS%%) + + AC_DEFINE(HAVE_LIBBLAS) + +@@ -960,7 +960,7 @@ + + LOC_CHECK_LIB_PATH(lapack,LAPACK,LAPACKLIB) + +-LOC_CHECK_LIBS(lapack,dgesv_,LAPACK,$LAPACKLIB,LAPACKLIB,$BLASLIB $MATHLIB,,,-lg2c) ++LOC_CHECK_LIBS(lapack,dgesv_,LAPACK,$LAPACKLIB,LAPACKLIB,$BLASLIB $MATHLIB,,,%%GCCLIBDIR%% %%FORTRANLIBS%%) + + AC_DEFINE(HAVE_LIBLAPACK) + Property changes on: head/databases/grass-i18n/files/patch-configure.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property