diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= -lts MAINTAINER= michaelo@apache.org @@ -134,12 +134,6 @@ ${FALSE} ; \ fi .endif -.if ${PORT_OPTIONS:MSTATIC} -LIBS_SQLITE3!= pkgconf --libs --static sqlite3 -LIBS+= ${LIBS_SQLITE3} -# for work with ICU -LIBS+= -lc++ -lm -.endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common --- a/devel/subversion-lts/Makefile.common +++ b/devel/subversion-lts/Makefile.common @@ -22,8 +22,7 @@ libutf8proc.so:textproc/utf8proc \ liblz4.so:archivers/liblz4 -CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} \ - --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat +CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat # =============================================================== OPTIONS_SUB= yes diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 7 +PORTREVISION= 8 MAINTAINER= michaelo@apache.org COMMENT= Version control system @@ -133,12 +133,6 @@ ${FALSE} ; \ fi .endif -.if ${PORT_OPTIONS:MSTATIC} -LIBS_SQLITE3!= pkgconf --libs --static sqlite3 -LIBS+= ${LIBS_SQLITE3} -# for work with ICU -LIBS+= -lc++ -lm -.endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -22,8 +22,7 @@ libutf8proc.so:textproc/utf8proc \ liblz4.so:archivers/liblz4 -CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} \ - --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat +CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat # =============================================================== OPTIONS_SUB= yes