diff options
| author | mandree <mandree@FreeBSD.org> | 2011-03-22 02:02:28 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2011-03-22 02:02:28 +0800 |
| commit | 22a3429ff5fa28d95b6d44c3a830a45e3971709c (patch) | |
| tree | ade5c877851977d9b423c219a6404b74311ec9fe /databases | |
| parent | 3a5239b69323a10ccf82f25e92e7381c03c29024 (diff) | |
| download | freebsd-ports-gnome-22a3429ff5fa28d95b6d44c3a830a45e3971709c.tar.gz freebsd-ports-gnome-22a3429ff5fa28d95b6d44c3a830a45e3971709c.tar.zst freebsd-ports-gnome-22a3429ff5fa28d95b6d44c3a830a45e3971709c.zip | |
Move CPPFLAGS out of CONFIGURE_ENV.
Fix up pkg-plist for WITH_JAVA and WITH_SQL builds.
Remove trailing whitespace.
Bump PORTREVISION.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/db5/Makefile | 6 | ||||
| -rw-r--r-- | databases/db5/pkg-plist | 18 | ||||
| -rw-r--r-- | databases/db51/Makefile | 6 | ||||
| -rw-r--r-- | databases/db51/pkg-plist | 18 |
4 files changed, 30 insertions, 18 deletions
diff --git a/databases/db5/Makefile b/databases/db5/Makefile index c0ae153a45cb..cd7babef78e4 100644 --- a/databases/db5/Makefile +++ b/databases/db5/Makefile @@ -7,8 +7,9 @@ PORTNAME= db51 PORTVERSION= 5.1.25.0 +PORTREVISION= 1 CATEGORIES= databases java -MASTER_SITES= http://download.oracle.com/berkeley-db/ +MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= DISTNAME= db-${PORTVERSION:R} DIST_SUBDIR= bdb @@ -53,7 +54,8 @@ libdb_sql= USE_JAVA= yes JAVA_VERSION= 1.5+ CONFIGURE_ARGS+= --enable-java -CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include" JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" +CPPFLAGS+= "-I${JAVA_HOME}/include" +CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" PLIST_SUB+= JAVA="" libdb_java= libdb_java .else diff --git a/databases/db5/pkg-plist b/databases/db5/pkg-plist index 293e212f9a1e..d39c63f72459 100644 --- a/databases/db5/pkg-plist +++ b/databases/db5/pkg-plist @@ -66,22 +66,26 @@ lib/db51/libdb_stl-5.1.so.0 lib/db51/libdb_stl-5.so lib/db51/libdb_stl.a lib/db51/libdb_stl.so -%%JAVA%%lib/db51/libdb_java-5.1_g.so -%%JAVA%%lib/db51/libdb_java-5.1.so -%%JAVA%%lib/db51/libdb_java-5.1.la +%%JAVA%%lib/db51/db.jar %%JAVA%%lib/db51/libdb_java-5.1.a +%%JAVA%%lib/db51/libdb_java-5.1.la +%%JAVA%%lib/db51/libdb_java-5.1.so +%%JAVA%%lib/db51/libdb_java-5.1.so.0 +%%JAVA%%lib/db51/libdb_java-5.1_g.so %%JAVA%%lib/db51/libdb_java-5.so %%JAVA%%lib/db51/libdb_java.a %%JAVA%%lib/db51/libdb_java.so -%%JAVA%%lib/db51/db.jar %%JAVA%%lib/libdb_java-5.1.so -%%SQL%%lib/db51/libdb_sql-5.1.so -%%SQL%%lib/db51/libdb_sql-5.1.la +%%JAVA%%lib/libdb_java-5.1.so.0 %%SQL%%lib/db51/libdb_sql-5.1.a +%%SQL%%lib/db51/libdb_sql-5.1.la +%%SQL%%lib/db51/libdb_sql-5.1.so +%%SQL%%lib/db51/libdb_sql-5.1.so.0 %%SQL%%lib/db51/libdb_sql-5.so -%%SQL%%lib/db51/libdb_sql.so %%SQL%%lib/db51/libdb_sql.a +%%SQL%%lib/db51/libdb_sql.so %%SQL%%lib/libdb_sql-5.1.so +%%SQL%%lib/libdb_sql-5.1.so.0 lib/libdb-5.1.so.0 lib/libdb-5.1.so lib/libdb_cxx-5.1.so diff --git a/databases/db51/Makefile b/databases/db51/Makefile index c0ae153a45cb..cd7babef78e4 100644 --- a/databases/db51/Makefile +++ b/databases/db51/Makefile @@ -7,8 +7,9 @@ PORTNAME= db51 PORTVERSION= 5.1.25.0 +PORTREVISION= 1 CATEGORIES= databases java -MASTER_SITES= http://download.oracle.com/berkeley-db/ +MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= DISTNAME= db-${PORTVERSION:R} DIST_SUBDIR= bdb @@ -53,7 +54,8 @@ libdb_sql= USE_JAVA= yes JAVA_VERSION= 1.5+ CONFIGURE_ARGS+= --enable-java -CONFIGURE_ENV= CPPFLAGS="-I${JAVA_HOME}/include" JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" +CPPFLAGS+= "-I${JAVA_HOME}/include" +CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" PLIST_SUB+= JAVA="" libdb_java= libdb_java .else diff --git a/databases/db51/pkg-plist b/databases/db51/pkg-plist index 293e212f9a1e..d39c63f72459 100644 --- a/databases/db51/pkg-plist +++ b/databases/db51/pkg-plist @@ -66,22 +66,26 @@ lib/db51/libdb_stl-5.1.so.0 lib/db51/libdb_stl-5.so lib/db51/libdb_stl.a lib/db51/libdb_stl.so -%%JAVA%%lib/db51/libdb_java-5.1_g.so -%%JAVA%%lib/db51/libdb_java-5.1.so -%%JAVA%%lib/db51/libdb_java-5.1.la +%%JAVA%%lib/db51/db.jar %%JAVA%%lib/db51/libdb_java-5.1.a +%%JAVA%%lib/db51/libdb_java-5.1.la +%%JAVA%%lib/db51/libdb_java-5.1.so +%%JAVA%%lib/db51/libdb_java-5.1.so.0 +%%JAVA%%lib/db51/libdb_java-5.1_g.so %%JAVA%%lib/db51/libdb_java-5.so %%JAVA%%lib/db51/libdb_java.a %%JAVA%%lib/db51/libdb_java.so -%%JAVA%%lib/db51/db.jar %%JAVA%%lib/libdb_java-5.1.so -%%SQL%%lib/db51/libdb_sql-5.1.so -%%SQL%%lib/db51/libdb_sql-5.1.la +%%JAVA%%lib/libdb_java-5.1.so.0 %%SQL%%lib/db51/libdb_sql-5.1.a +%%SQL%%lib/db51/libdb_sql-5.1.la +%%SQL%%lib/db51/libdb_sql-5.1.so +%%SQL%%lib/db51/libdb_sql-5.1.so.0 %%SQL%%lib/db51/libdb_sql-5.so -%%SQL%%lib/db51/libdb_sql.so %%SQL%%lib/db51/libdb_sql.a +%%SQL%%lib/db51/libdb_sql.so %%SQL%%lib/libdb_sql-5.1.so +%%SQL%%lib/libdb_sql-5.1.so.0 lib/libdb-5.1.so.0 lib/libdb-5.1.so lib/libdb_cxx-5.1.so |