From 4ef4f27ad9de3b0c5ade62181dbf2906f694f956 Mon Sep 17 00:00:00 2001
From: nivit <nivit@FreeBSD.org>
Date: Mon, 16 Jul 2012 16:46:10 +0000
Subject: - Update to 0.24 - Set a different MASTER_SITE_SUBDIR for source and
 docs - Convert to the new options framework

---
 cad/fidocadj/Makefile | 25 ++++++++++++++++---------
 cad/fidocadj/distinfo |  8 ++++----
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'cad')

diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index 6a781bfe3e27..5111d71767e2 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -6,15 +6,12 @@
 #
 
 PORTNAME=	fidocadj
-PORTVERSION=	0.23.7
+PORTVERSION=	0.24
 #PORTREVISION=	0
 CATEGORIES=	cad
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}.jar
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${PORTNAME}_manual_en.pdf
-.endif
+MASTER_SITES=	SF:src,docs
+MASTER_SITE_SUBDIR=	${PORTNAME}/:src ${PORTNAME}/manuals/:docs
+DISTFILES=	${PORTNAME}.jar:src
 EXTRACT_ONLY=
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -31,15 +28,25 @@ SUB_FILES=	${PORTNAME}.sh
 JAVA_VERSION=	1.5+
 USE_JAVA=	yes
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 FDCJ_MANUAL=	${PORTNAME}_manual_en.pdf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${DATADIR}; \
 	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.jar ${DATADIR}/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR} && \
 	${INSTALL_DATA} ${DISTDIR}/${FDCJ_MANUAL} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+DISTFILES+=	${PORTNAME}_manual_en.pdf:docs
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/cad/fidocadj/distinfo b/cad/fidocadj/distinfo
index 6368beeda566..71708b60742a 100644
--- a/cad/fidocadj/distinfo
+++ b/cad/fidocadj/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fidocadj.jar) = 94e6e6c67913c8312d00a2bc7b37715db6f3934aff2ded888a30426b25af892c
-SIZE (fidocadj.jar) = 419310
-SHA256 (fidocadj_manual_en.pdf) = 5020e01a6d37b35647917785901b58d4229be2fdb65784766de2b28ca8ad6132
-SIZE (fidocadj_manual_en.pdf) = 2435667
+SHA256 (fidocadj.jar) = 422ef03693dda6264e20be4f7678bf3fe30a93afd7fe34714542b8507f199bf5
+SIZE (fidocadj.jar) = 443351
+SHA256 (fidocadj_manual_en.pdf) = 0b54911d02710cc31e8905decbdb83ca0b28fc55ab5777664512cfbe80300d49
+SIZE (fidocadj_manual_en.pdf) = 2155837
-- 
cgit