diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/freetds-devel/Makefile | 3 | ||||
| -rw-r--r-- | databases/freetds-devel/files/patch-src-tds-Makefile | 2 | ||||
| -rw-r--r-- | databases/postgis/Makefile | 2 | ||||
| -rw-r--r-- | databases/qdbm/Makefile | 2 | ||||
| -rw-r--r-- | databases/ruby-sybct/Makefile | 1 | ||||
| -rw-r--r-- | databases/ruby-sybct/files/patch-extconf.rb | 2 | ||||
| -rw-r--r-- | databases/spatialite_gui/Makefile | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 1e1c296f1f30..2ddae76ea491 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -93,7 +93,8 @@ post-patch: s|/freetds.conf|/freetds.conf.dist|g ; \ s|/locales.conf|/locales.conf.dist|g ; \ s|/pool.conf|/pool.conf.dist|g ; \ - s| common.h||g' + s| common.h||g ; \ + s|%%ICONV_LIB%%|${ICONV_LIB}|' post-install: .if !defined(NOPORTDOCS) diff --git a/databases/freetds-devel/files/patch-src-tds-Makefile b/databases/freetds-devel/files/patch-src-tds-Makefile index f38068974a2d..f0789382c90c 100644 --- a/databases/freetds-devel/files/patch-src-tds-Makefile +++ b/databases/freetds-devel/files/patch-src-tds-Makefile @@ -5,7 +5,7 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -+LIBS = @LIBS@ -liconv ++LIBS = @LIBS@ %%ICONV_LIB%% LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile index b28343a2e08c..26648a147cc0 100644 --- a/databases/postgis/Makefile +++ b/databases/postgis/Makefile @@ -58,7 +58,7 @@ MAKE_ARGS+= NOPORTDOCS=yes .endif post-extract: - @${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \ + @${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#${ICONV_LIB} -L${LOCALBASE}/lib#g' \ ${WRKSRC}/loader/Makefile.in post-patch: diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index b30334166730..a92a1c293f94 100644 --- a/databases/qdbm/Makefile +++ b/databases/qdbm/Makefile @@ -45,7 +45,7 @@ post-patch: post-build: cd ${WRKSRC}/lab; \ - ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" fmtcnv031127 + ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${ICONV_LIB}" fmtcnv031127 post-install: ${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${PREFIX}/bin diff --git a/databases/ruby-sybct/Makefile b/databases/ruby-sybct/Makefile index beb4c3125abe..978cb5a43666 100644 --- a/databases/ruby-sybct/Makefile +++ b/databases/ruby-sybct/Makefile @@ -24,6 +24,7 @@ USES= iconv post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \ ${WRKSRC}/extconf.rb post-install: diff --git a/databases/ruby-sybct/files/patch-extconf.rb b/databases/ruby-sybct/files/patch-extconf.rb index 1d86666b4c24..695628f04451 100644 --- a/databases/ruby-sybct/files/patch-extconf.rb +++ b/databases/ruby-sybct/files/patch-extconf.rb @@ -11,7 +11,7 @@ + sybase = "%%LOCALBASE%%" + $CFLAGS = "-g -Wall -DFREETDS -I#{sybase}/include" + $LDFLAGS = " -L#{sybase}/lib " -+ $LOCAL_LIBS = "-lct -lsybdb -ltds -rdynamic -lm -liconv" ++ $LOCAL_LIBS = "-lct -lsybdb -ltds -rdynamic -lm %%ICONV_LIB%%" ### mac-osx-tiger + Free TDS (freetds-0.64 ) ################ # sybase = "/usr/local/freetds" diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile index 4804083971fe..e6ca9ccbbb72 100644 --- a/databases/spatialite_gui/Makefile +++ b/databases/spatialite_gui/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USES= pkgconfig iconv CPPFLAGS+= -I${LOCALBASE}/include `${WX_CONFIG} --cppflags` -LDFLAGS+= -L${LOCALBASE}/lib -liconv `${WX_CONFIG} --libs` +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} `${WX_CONFIG} --libs` CONFIGURE_ARGS+=CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes |