mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

Move CPPFLAGS out of CONFIGURE_ENV.

Browse Source 
Fix up pkg-plist for WITH_JAVA and WITH_SQL builds.
Remove trailing whitespace.
Bump PORTREVISION.
This commit is contained in:
Matthias Andree 2011-03-21 18:02:28 +00:00
parent 78fbc18fea
commit 07afda9df9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=271409
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
databases/db5/Makefile
View File

@ -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

18
databases/db5/pkg-plist
View File

@ -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

6
databases/db51/Makefile
View File

@ -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

18
databases/db51/pkg-plist
View File

@ -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