Attachment 162956 Details for Bug 204422 – Updated Makefile

[patch] Updated Makefile

artifactory-4.2.2.diff (text/plain), 2.55 KB, created by David Harrigan on 2015-11-10 08:43:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Harrigan

Created: 2015-11-10 08:43:57 UTC

Size: 2.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 401187)
>+++ Makefile	(working copy)
>@@ -1,53 +1,54 @@
> # $FreeBSD$
> 
>-PORTNAME=	artifactory
>-PORTVERSION=	4.2.2
>-CATEGORIES=	devel java
>-MASTER_SITES=	https://bintray.com/artifact/download/jfrog/artifactory/
>-DISTNAME=	jfrog-${PORTNAME}-oss-${PORTVERSION}
>+PORTNAME=		artifactory
>+PORTVERSION=		4.2.2
>+CATEGORIES=		devel java
>+MASTER_SITES=		https://bintray.com/artifact/download/jfrog/artifactory/
>+DISTNAME=		jfrog-${PORTNAME}-oss-${PORTVERSION}
> 
>-MAINTAINER=	dharrigan@gmail.com
>-COMMENT=	Universal Artifact Repository Manager
>+MAINTAINER=		dharrigan@gmail.com
>+COMMENT=		Universal Artifact Repository Manager
> 
>-LICENSE=	GPLv3 LGPL3 APACHE20
>-LICENSE_COMB=	multi
>-LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING ${WRKSRC}/tomcat/LICENSE
>+LICENSE=		GPLv3 LGPL3 APACHE20
>+LICENSE_COMB=		multi
>+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
>+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSER
>+LICENSE_FILE_APACHE20=	${WRKSRC}/tomcat/LICENSE
> 
>-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
>+RUN_DEPENDS=		bash:${PORTSDIR}/shells/bash
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-oss-${PORTVERSION}
>+WRKSRC=			${WRKDIR}/${PORTNAME}-oss-${PORTVERSION}
> 
>-NO_ARCH=	yes
>-USE_JAVA=	yes
>-USES=		shebangfix zip
>-SHEBANG_FILES=	bin/artifactory.sh
>-NO_BUILD=	yes
>-JAVA_VERSION=	1.8+
>-JAVA_VENDOR=	openjdk
>-ONLY_FOR_ARCHS=	i386 amd64
>-USE_RC_SUBR=	${PORTNAME}
>+USE_JAVA=		yes
>+USES=			shebangfix zip
>+SHEBANG_FILES=		bin/artifactory.sh
>+NO_BUILD=		yes
>+JAVA_VERSION=		1.8+
>+JAVA_VENDOR=		openjdk
>+NO_ARCH=		yes
>+USE_RC_SUBR=		${PORTNAME}
> 
>-APP_NAME=	${PORTNAME}
>-APP_HOME?=	${PORTNAME}
>-PID_FILE?=	/var/run/${PORTNAME}.pid
>-VARDIR=		/var/${PORTNAME}
>+APP_NAME=		${PORTNAME}
>+APP_HOME?=		${PORTNAME}
>+PID_FILE?=		/var/run/${PORTNAME}.pid
>+VARDIR=			/var/${PORTNAME}
> 
>-USERS=		artifactory
>-GROUPS=		artifactory
>+USERS=			artifactory
>+GROUPS=			artifactory
> 
>-SUB_LIST=	APP_HOME=${PREFIX}/${APP_HOME} \
>-		APP_NAME=${APP_NAME} \
>-		PID_FILE=${PID_FILE} \
>-		VARDIR=${VARDIR}
>+SUB_LIST=		APP_HOME=${PREFIX}/${APP_HOME} \
>+			APP_NAME=${APP_NAME} \
>+			PID_FILE=${PID_FILE} \
>+			VARDIR=${VARDIR}
> 
>-SUB_FILES=	pkg-message \
>+SUB_FILES=		pkg-message \
> 
>-PLIST_SUB=	APP_HOME=${APP_HOME} \
>-		VARDIR=${VARDIR}
>+PLIST_SUB=		APP_HOME=${APP_HOME} \
>+			VARDIR=${VARDIR}
> 
> do-install:
>-.for f in artifactory-service.exe artifactory.bat installService.bat \
>-	uninstallService.bat
>+
>+.for f in artifactory-service.exe artifactory.bat installService.bat uninstallService.bat
> 	${RM} ${WRKSRC}/bin/${f}
> .endfor
> 	${RM} ${WRKSRC}/tomcat/bin/*.bat

Flags:

dharrigan: maintainer-approval+

Actions: View | Diff

Attachments on bug 204422: 162954 | 162956 | 163189