diff options
| author | mandree <mandree@FreeBSD.org> | 2011-03-22 01:50:47 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2011-03-22 01:50:47 +0800 |
| commit | 3a5239b69323a10ccf82f25e92e7381c03c29024 (patch) | |
| tree | 0d5ea52d996b27a357ec90409100ed86dac2fc2a /databases | |
| parent | 433599ee1359165a75f4034025cc04408faf31e1 (diff) | |
| download | freebsd-ports-gnome-3a5239b69323a10ccf82f25e92e7381c03c29024.tar.gz freebsd-ports-gnome-3a5239b69323a10ccf82f25e92e7381c03c29024.tar.zst freebsd-ports-gnome-3a5239b69323a10ccf82f25e92e7381c03c29024.zip | |
Move CPPFLAGS out of CONFIGURE_ENV.
Fix up pkg-plist for WITH_JAVA builds.
Bump PORTREVISION.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/db50/Makefile | 4 | ||||
| -rw-r--r-- | databases/db50/pkg-plist | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/databases/db50/Makefile b/databases/db50/Makefile index 29fa6b2d64d2..9f870e5c1929 100644 --- a/databases/db50/Makefile +++ b/databases/db50/Makefile @@ -7,6 +7,7 @@ PORTNAME= db50 PORTVERSION= 5.0.32.0 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= @@ -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/db50/pkg-plist b/databases/db50/pkg-plist index 81f7a1576d4c..a0bddebb302d 100644 --- a/databases/db50/pkg-plist +++ b/databases/db50/pkg-plist @@ -63,10 +63,17 @@ lib/db50/libdb_stl-5.0.so.0 lib/db50/libdb_stl-5.so lib/db50/libdb_stl.a lib/db50/libdb_stl.so -%%JAVA%%lib/db50/libdb_java-5.0.so.0 -%%JAVA%%lib/db50/libdb_java-5.0.la -%%JAVA%%lib/db50/libdb_java-5.0.a %%JAVA%%lib/db50/db.jar +%%JAVA%%lib/db50/libdb_java-5.0.a +%%JAVA%%lib/db50/libdb_java-5.0.la +%%JAVA%%lib/db50/libdb_java-5.0.so +%%JAVA%%lib/db50/libdb_java-5.0.so.0 +%%JAVA%%lib/db50/libdb_java-5.0_g.so +%%JAVA%%lib/db50/libdb_java-5.so +%%JAVA%%lib/db50/libdb_java.a +%%JAVA%%lib/db50/libdb_java.so +%%JAVA%%lib/libdb_java-5.0.so +%%JAVA%%lib/libdb_java-5.0.so.0 %%SQL%%lib/db50/libdb_sql-5.0.so.0 %%SQL%%lib/db50/libdb_sql-5.0.la %%SQL%%lib/db50/libdb_sql-5.0.a |