Attachment 143651 Details for Bug 190907 – Misc. fixes for jline

[patch] Misc. fixes for jline

jline.patch (text/plain), 2.85 KB, created by Jimmy Olgeni on 2014-06-10 19:35:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2014-06-10 19:35:05 UTC

Size: 2.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 357368)
>+++ Makefile	(working copy)
>@@ -1,24 +1,27 @@
> # Created by: Martin Kammerhofer <mkamm@gmx.net>
> # $FreeBSD$
> 
>-PORTNAME=		jline
>-PORTVERSION=		0.9.94
>-CATEGORIES=		devel java
>-MASTER_SITES=		SF
>+PORTNAME=	jline
>+PORTVERSION=	0.9.94
>+CATEGORIES=	devel java
>+MASTER_SITES=	SF
> 
> MAINTAINER=	mkamm@gmx.net
>-COMMENT=	JLine is a Java library for handling console input
>+COMMENT=	Java library for handling console input
> 
>-LICENSE=	BSD
>+LICENSE=	BSD2CLAUSE
> 
>-PKGMESSAGE=	${WRKDIR}/pkg-message
> USES=		zip
> USE_JAVA=	yes
>+
>+SUB_FILES=	pkg-message
>+SUB_LIST=	JAVAJARDIR=${JAVAJARDIR}
>+
> OPTIONS_DEFINE=	JLINEPATCH
>-JLINEPATCH_DESC=	Allow ConsoleRunner customized completion
>+
>+JLINEPATCH_DESC=Allow ConsoleRunner customized completion
> JLINEJAR=	${WRKSRC}/jline-${PORTVERSION}.jar
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> # Update jar archive with patched jline.ConsoleRunner class.
>@@ -31,35 +34,12 @@
> .endif
> 
> do-install:
>-	${INSTALL_DATA} ${JLINEJAR} ${JAVAJARDIR}
>-	${LN} -nfs ${JAVAJARDIR}/jline-${PORTVERSION}.jar \
>-		   ${JAVAJARDIR}/jline.jar
>+	${INSTALL_DATA} ${JLINEJAR} ${STAGEDIR}${JAVAJARDIR}/jline.jar
> .if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-	${CP} -R ${WRKSRC}/apidocs ${WRKSRC}/examples ${DOCSDIR}
>-	${INSTALL_DATA} ${FILESDIR}/JLineCompleter.py ${DOCSDIR}/examples
>-	${INSTALL_DATA} ${FILESDIR}/jython.sh ${DOCSDIR}/examples
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${CP} -R ${WRKSRC}/apidocs ${WRKSRC}/examples ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${FILESDIR}/JLineCompleter.py ${STAGEDIR}${DOCSDIR}/examples
>+	${INSTALL_DATA} ${FILESDIR}/jython.sh ${STAGEDIR}${DOCSDIR}/examples
> .endif
> 
>-post-install:
>-	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' -- \
>-		${.CURDIR}/pkg-message >${PKGMESSAGE}
>-	@${CAT} ${PKGMESSAGE}
>-
>-# Next rule is for maintainer use only: Automatically (re)create the pkg-plist.
>-plist:
>-	@test -e ${CONFIGURE_COOKIE} || { \
>-		${ECHO_MSG} >&2 "do 'make configure' first!"; exit 64; }
>-	${ECHO_CMD} "%%JAVAJARDIR%%/jline-${PORTVERSION}.jar" >${PLIST}
>-	${ECHO_CMD} "%%JAVAJARDIR%%/jline.jar" >>${PLIST}
>-	( \
>-		cd ${WRKSRC} || exit; \
>-		${FIND} ./apidocs ./examples -type f | ${SORT};	\
>-		${ECHO_CMD} "./examples/JLineCompleter.py";	\
>-		${ECHO_CMD} "./examples/jython.sh";		\
>-		${FIND} ./apidocs ./examples -type d | ${SORT} -r \
>-			| ${SED} -e 's/^/@dirrm /';	\
>-		${ECHO_CMD} "@dirrm %%DOCSDIR%%" ;	\
>-	) | ${SED} -e 's/\.\//%%DOCSDIR%%\//' -e 's/^/%%PORTDOCS%%/' >>${PLIST}
>-
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 357368)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-%%JAVAJARDIR%%/jline-0.9.94.jar
> %%JAVAJARDIR%%/jline.jar
> %%PORTDOCS%%%%DOCSDIR%%/apidocs/allclasses-frame.html
> %%PORTDOCS%%%%DOCSDIR%%/apidocs/allclasses-noframe.html

Flags:

olgeni: maintainer-approval? (mkamm)

Actions: View | Diff

Attachments on bug 190907: 143651