svn commit: r332090 - in head/java/sqlitejdbc: . files

[Alex Dupre]

Author: ale
Date: Wed Oct 30 10:03:06 2013
New Revision: 332090
URL: http://svnweb.freebsd.org/changeset/ports/332090

Log:
  Fix build with clang and stagify.
  
  Approved by:	maintainer

Added:
  head/java/sqlitejdbc/files/patch-Makefile.common   (contents, props changed)
Modified:
  head/java/sqlitejdbc/Makefile

Modified: head/java/sqlitejdbc/Makefile
==============================================================================
--- head/java/sqlitejdbc/Makefile	Wed Oct 30 10:01:16 2013	(r332089)
+++ head/java/sqlitejdbc/Makefile	Wed Oct 30 10:03:06 2013	(r332090)
@@ -3,9 +3,9 @@
 
 PORTNAME=	sqlitejdbc
 PORTVERSION=	056
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-src
+PORTREVISION=	1
 CATEGORIES=	java databases
 MASTER_SITES=	http://files.zentus.com/sqlitejdbc/
 EXTRACT_SUFX=	.tgz
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lapo at lapo.it
 COMMENT=	A Java JDBC driver for SQLite
 
-LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}
 USE_JAVA=	yes
@@ -21,16 +21,16 @@ JAVA_VERSION=	1.6+
 USE_GMAKE=	yes
 MAKE_ENV=	JAVA_HOME="${JAVA_HOME}"
 ALL_TARGET=	native
-USE_LDCONFIG=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/sqlitejdbc-native.jar lib/libsqlitejdbc.so
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/build/sqlitejdbc-v${PORTVERSION}-native.jar ${JAVAJARDIR}/sqlitejdbc-native.jar
-	${INSTALL_DATA} ${WRKSRC}/build/FreeBSD/libsqlitejdbc.so ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/build/sqlitejdbc-v${PORTVERSION}-native.jar \
+		${STAGEDIR}${JAVAJARDIR}/sqlitejdbc-native.jar
+	${INSTALL_DATA} ${WRKSRC}/build/FreeBSD/libsqlitejdbc.so \
+		${STAGEDIR}${PREFIX}/lib/
 
 .include <bsd.port.mk>

Added: head/java/sqlitejdbc/files/patch-Makefile.common
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/sqlitejdbc/files/patch-Makefile.common	Wed Oct 30 10:03:06 2013	(r332090)
@@ -0,0 +1,11 @@
+--- Makefile.common.orig	2013-10-30 08:27:27.420880093 +0000
++++ Makefile.common	2013-10-30 08:27:45.873878420 +0000
+@@ -56,7 +56,7 @@
+ target     := $(os)-$(arch)
+ 
+ # os=Default is meant to be generic unix/linux
+-Default_CC        := gcc
++Default_CC        := $(CC)
+ Default_STRIP     := strip
+ Default_CFLAGS    := -I$(JAVA_HOME)/include -Os -fPIC
+ Default_LINKFLAGS := -shared