diff options
| -rw-r--r-- | deskutils/pinot/Makefile | 9 | ||||
| -rw-r--r-- | net-im/jabberd/Makefile | 3 | ||||
| -rw-r--r-- | security/klamav/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/bacula-server-devel/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/bacula-server/Makefile | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index 809b1a646b2e..261795de2aaa 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -7,6 +7,7 @@ PORTNAME= pinot PORTVERSION= 0.84 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_BERLIOS} #MASTER_SITES= http://www.chez.com/colinf/pinot/ \ @@ -16,8 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= thierry@FreeBSD.org COMMENT= Personal search and metasearch for the Free Desktop -BUILD_DEPENDS= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils \ - ${SQ3THOL}:${PORTSDIR}/databases/sqlite3-threads +BUILD_DEPENDS= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils LIB_DEPENDS= xapian.19:${PORTSDIR}/databases/xapian-core \ gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ textcat.0:${PORTSDIR}/textproc/libtextcat \ @@ -28,7 +28,6 @@ LIB_DEPENDS= xapian.19:${PORTSDIR}/databases/xapian-core \ tag.5:${PORTSDIR}/audio/taglib \ curl.4:${PORTSDIR}/ftp/curl RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info \ - ${SQ3THOL}:${PORTSDIR}/databases/sqlite3-threads \ antiword:${PORTSDIR}/textproc/antiword \ xdg-open:${PORTSDIR}/devel/xdg-utils \ pdftotext:${PORTSDIR}/graphics/xpdf \ @@ -45,7 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" MKDIR_P="${MKDIR}" USE_XORG= pixman USE_GETTEXT= yes -#USE_SQLITE= 3 # Replaced by sqlite3-threads +USE_SQLITE= 3 USE_PYTHON= yes USE_OPENSSL= yes USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters @@ -59,8 +58,6 @@ CONFIGURE_ARGS+= --enable-soap=yes CONFIGURE_ARGS+= --enable-debug=yes .endif -SQ3THOL= ${LOCALBASE}/share/sqlite3/sqlite3_with_threads-override-locks - INSTALLS_ICONS= yes PLIST_SUB= DESKBAR_MOD="${LDESKBAR_MOD}" diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 0ffa434e5989..b2f2556813bb 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -7,6 +7,7 @@ PORTNAME= jabberd PORTVERSION= 2.1.23 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://ftp.xiaoka.com/jabberd2/releases/ DIST_SUBDIR= jabber @@ -83,7 +84,7 @@ PLIST_SUB+= SUB_PGSQL="@comment " .if defined(WITH_SQLITE) CONFIGURE_ARGS+=--enable-sqlite -LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3-threads +LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CFLAGS+= ${PTHREAD_CFLAGS} PLIST_SUB+= SUB_SQLITE="" .else diff --git a/security/klamav/Makefile b/security/klamav/Makefile index d0015d2333a5..a171973f9d0e 100644 --- a/security/klamav/Makefile +++ b/security/klamav/Makefile @@ -7,6 +7,7 @@ PORTNAME= klamav PORTVERSION= 0.42 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= klamav @@ -15,8 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= anderson@cnpm.embrapa.br COMMENT= A KDE 3 front-end to Clam Anti-Virus -LIB_DEPENDS= clamav:${PORTSDIR}/security/clamav \ - sqlite3:${PORTSDIR}/databases/sqlite3-threads +LIB_DEPENDS= clamav:${PORTSDIR}/security/clamav WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION} @@ -25,6 +25,7 @@ DOCSDIR= ${PREFIX}/share/doc/HTML/en/klamav02 USE_GZIP= yes USE_GMAKE= yes +USE_SQLITE= 3 USE_GNOME= pkgconfig USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile index 3b68fbdd3fe2..8c1cb6020faa 100644 --- a/sysutils/bacula-server-devel/Makefile +++ b/sysutils/bacula-server-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= bacula DISTVERSION= 2.1.30 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula @@ -141,7 +142,7 @@ DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .elif defined(WITH_SQLITE3) CONFIGURE_ARGS+= --with-sqlite3=yes -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3-threads +LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 DBTYPE= sqlite3 .else CONFIGURE_ARGS+= --with-sqlite=yes diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index c0c4f7ac5bb1..1f1137b161f8 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= bacula DISTVERSION= 2.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula @@ -159,7 +159,7 @@ DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .elif defined(WITH_SQLITE3) CONFIGURE_ARGS+= --with-sqlite3=yes -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3-threads +LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 DBTYPE= sqlite3 .else CONFIGURE_ARGS+= --with-sqlite=yes |