mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-14 07:43:06 +00:00
Code Issues Releases Activity

Fix build with clang and stagify.

Browse Source
This commit is contained in:
Alex Dupre 2013-10-30 10:01:16 +00:00
parent 32a45817eb
commit 74bf2d9990
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=332089
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
devel/charva/Makefile
View File

@ -14,36 +14,44 @@ COMMENT= A Java Windowing Toolkit for Text Terminals
BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake
RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
OPTIONS_DEFINE= DOCS
USE_ZIP= yes
USE_DOS2UNIX= Makefile.freebsd.txt
USE_JAVA= yes
JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= clean makeDLL dist
.if !defined(NOPORTDOCS)
ALL_TARGET+= javadoc
PORTDOCS= *
.endif
PLIST_SUB= JAVA_HOME=${JAVA_HOME:S/${PREFIX}\///}
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \
%%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libTerminal.so
PORTDOCS= *
# Hack to be removed when included in bsd.java.mk
DESTDIRNAME= -Dstagedir
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
ALL_TARGET+= javadoc
.endif
NO_STAGE= yes
do-install:
@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
@${INSTALL_DATA} ${WRKSRC}/java/dist/lib/${PORTNAME}.jar \
${JAVAJARDIR}/${PORTNAME}.jar
${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
@${ECHO_MSG} " [DONE]"
@${ECHO_MSG} -n ">> Installing JNI library as ${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so..."
-@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${MACHINE_ARCH}
@${INSTALL_PROGRAM} ${WRKSRC}/c/lib/libTerminal.so \
${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so
${STAGEDIR}${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so
@${ECHO_MSG} " [DONE]"
.if !defined(NOPORTDOCS)
.if ${PORT_OPTIONS:MDOCS}
@${ECHO_MSG} -n ">> Installing documentation..."
@${MKDIR} ${DOCSDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC}/docs && ${FIND} * \
| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
@${ECHO_MSG} " [DONE]"
.endif

10
devel/charva/files/patch-c_src_Makefile.freebsd.txt Normal file
View File

@ -0,0 +1,10 @@
--- ./c/src/Makefile.freebsd.txt.orig 2013-10-30 08:21:28.829906040 +0000
+++ ./c/src/Makefile.freebsd.txt 2013-10-30 08:21:37.384905061 +0000
@@ -6,7 +6,6 @@
SHARED_OBJECT_EXT = so
TARGET = libTerminal.${SHARED_OBJECT_EXT}
-CC = gcc
CFLAGS = -fpic -shared
# The file "jni.h" is in ${JAVA_HOME}/include