svn commit: r364951 - in head: graphics/ocaml-lablgl x11-toolkits/ocaml-lablgtk2

[Alexey Dokuchaev]

Author: danfe
Date: Fri Aug 15 09:10:16 2014
New Revision: 364951
URL: http://svnweb.freebsd.org/changeset/ports/364951
QAT: https://qat.redports.org/buildarchive/r364951/

Log:
  Cleanup Makefiles to allow further work on these ports.

Modified:
  head/graphics/ocaml-lablgl/Makefile
  head/x11-toolkits/ocaml-lablgtk2/Makefile

Modified: head/graphics/ocaml-lablgl/Makefile
==============================================================================
--- head/graphics/ocaml-lablgl/Makefile	Fri Aug 15 09:05:49 2014	(r364950)
+++ head/graphics/ocaml-lablgl/Makefile	Fri Aug 15 09:10:16 2014	(r364951)
@@ -14,30 +14,29 @@ COMMENT=	OpenGL interface for Objective 
 
 LICENSE=	BSD3CLAUSE
 
-WRKSRC=		${WRKDIR}/lablGL
-USES=		gmake
+CONFLICTS=	ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
+
+USES=		gmake tk:84,85
 USE_XORG=	x11 xext xmu
 USE_GL=		glut
 USE_OCAML=	yes
 USE_OCAML_WASH=	yes
 ALL_TARGET=	all opt
 MAKE_JOBS_UNSAFE=	yes
+WRKSRC=		${WRKDIR}/lablGL
 
-OPTIONS_DEFINE=	THREADS
-THREADS_DESC=	Threaded Tcl/Tk (must match lang/ocaml)
-
-OPTIONS_DEFAULT=	THREADS
+DOCSDIR=	${PREFIX}/share/doc/ocaml/lablgl
+EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/lablgl
 
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 
-DOCSDIR=	${PREFIX}/share/doc/ocaml/lablgl
-EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/lablgl
+OPTIONS_DEFINE=	THREADS DOCS
+OPTIONS_DEFAULT=	THREADS
 
-CONFLICTS=	ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
+THREADS_DESC=	Threaded Tcl/Tk (must match lang/ocaml)
 
 .include <bsd.port.options.mk>
 
-USES+=		tk:84,85
 .if ${PORT_OPTIONS:MTHREADS}
 THR_CPP=	${PTHREAD_CFLAGS}
 THR_LD=		${PTHREAD_LIBS}
@@ -74,13 +73,11 @@ pre-install:
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/lablglut
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/togl
-	@(cd ${WRKSRC}/LablGlut/examples && ${COPYTREE_SHARE} \* \
+	@(cd ${WRKSRC}/LablGlut/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR}/lablglut '! -name Makefile')
-	@(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} \* \
+	@(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR}/togl '! -name Makefile')
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile
==============================================================================
--- head/x11-toolkits/ocaml-lablgtk2/Makefile	Fri Aug 15 09:05:49 2014	(r364950)
+++ head/x11-toolkits/ocaml-lablgtk2/Makefile	Fri Aug 15 09:10:16 2014	(r364951)
@@ -1,4 +1,4 @@
-# Created by: Rene Ladan
+# Created by: Rene Ladan <rene at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lablgtk2
@@ -22,9 +22,10 @@ USE_OCAMLFIND_PLIST=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAML_WASH= 	yes
 
-OPTIONS_DEFINE=		GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 GTKSPELL \
-			LIBRSVG2
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFINE=		GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \
+			GTKSPELL LIBRSVG2 DOCS EXAMPLES
+_OPTIONS_DEFAULT=	GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \
+			GTKSPELL LIBRSVG2
 
 GNOMECANVAS_DESC=	GnomeCanvas support
 GNOMEUI_DESC=		GNOME 2 UI support
@@ -132,14 +133,11 @@ post-patch:
 		${WRKSRC}/src/Makefile
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@cd ${WRKSRC}/examples ; ${COPYTREE_SHARE} \
-	"*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" ${STAGEDIR}${EXAMPLESDIR}
-.endif
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \
+	"*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" \
+		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>