svn commit: r324415 - in head/x11-toolkits/hs-frantk: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Aug  9 02:48:34 2013
New Revision: 324415
URL: http://svnweb.freebsd.org/changeset/ports/324415

Log:
  - Unbreak parallel builds by sanitizing build sequence (append underscore
    to the object file to avoid a clash with another rule)
  - Cleanup port's Makefile while here: tighten COMMENT, employ USE_TK,
    convert NOPORTDOCS, sort the knobs, do not hardcode PORTVERSION, etc.
  - Kill spaces at EOL in pkg-descr, use official spelling for Tcl/Tk, GHC,
    and Hugs 98 projects

Modified:
  head/x11-toolkits/hs-frantk/Makefile
  head/x11-toolkits/hs-frantk/files/patch-src::Makefile
  head/x11-toolkits/hs-frantk/pkg-descr

Modified: head/x11-toolkits/hs-frantk/Makefile
==============================================================================
--- head/x11-toolkits/hs-frantk/Makefile	Fri Aug  9 02:11:20 2013	(r324414)
+++ head/x11-toolkits/hs-frantk/Makefile	Fri Aug  9 02:48:34 2013	(r324415)
@@ -10,13 +10,22 @@ PKGNAMEPREFIX=	hs-
 DISTNAME=	FranTk${PORTVERSION:S/./_/}
 
 MAINTAINER=	haskell at FreeBSD.org
-COMMENT=	A GUI library for Haskell on top of Tcl-Tk
-
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
+COMMENT=	GUI library for Haskell on top of Tcl/Tk
 
 USES=		gmake
+USE_TK=		84
+
+ALL_TARGET=	hugs
+INSTALL_TARGET=	install_hugs
+
+WRKSRC=		${WRKDIR}/FranTk${PORTVERSION}/src
+
+PLIST_SUB+=	HUGS=""
+PLIST_SUB+=	GHC="@comment "
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
@@ -24,21 +33,16 @@ CFLAGS+=	-fPIC
 BROKEN=		Does not compile
 .endif
 
-WRKSRC=		${WRKDIR}/FranTk1.1/src
-
-ALL_TARGET=	hugs
-INSTALL_TARGET=	install_hugs
-PLIST_SUB+=	HUGS=""
-PLIST_SUB+=	GHC="@comment "
-
 post-patch:
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/frantk.conf
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} ${WRKDIR}/FranTk1.1/doc/frantk.pdf ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/frantk.pdf ${DOCSDIR}
 .endif
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-toolkits/hs-frantk/files/patch-src::Makefile
==============================================================================
--- head/x11-toolkits/hs-frantk/files/patch-src::Makefile	Fri Aug  9 02:11:20 2013	(r324414)
+++ head/x11-toolkits/hs-frantk/files/patch-src::Makefile	Fri Aug  9 02:48:34 2013	(r324415)
@@ -46,7 +46,7 @@
  	mkdir -p $(LIBDIR)
  	mkdir -p $(IMPORTS)
  	cp -p $(LIBS) $(LIBDIR)/
-@@ -150,13 +151,13 @@
+@@ -150,22 +151,29 @@
  
  # The directories containing the X11, Tcl and Tk (binary) libraries:
  
@@ -62,9 +62,20 @@
  
  
  hugs: TclHaskellSrc/TclPrim.so
-@@ -169,3 +170,8 @@
+ 
+-TclHaskellSrc/TclPrim.so: TclHaskellSrc/TclPrim.c TclHaskellSrc/tclhaskell.o TclHaskellSrc/tclhaskell.h
+-	$(CC) -c $(CC_OPTS) $(CC_INC) -o TclHaskellSrc/TclPrim.o -c TclHaskellSrc/TclPrim.c
++TclHaskellSrc/TclPrim_.o: TclHaskellSrc/TclPrim.c TclHaskellSrc/tclhaskell.h
++	$(CC) -c $(CC_OPTS) $(CC_INC) -o TclHaskellSrc/TclPrim_.o -c TclHaskellSrc/TclPrim.c
++
++TclHaskellSrc/TclPrim.so: TclHaskellSrc/TclPrim_.o TclHaskellSrc/tclhaskell.o
+ 	$(LD) $(SLD_OPTS) \
+ 		$(CCLIB) \
+-		-o TclHaskellSrc/TclPrim.so TclHaskellSrc/TclPrim.o TclHaskellSrc/tclhaskell.o \
++		-o TclHaskellSrc/TclPrim.so TclHaskellSrc/TclPrim_.o TclHaskellSrc/tclhaskell.o \
  			$(TCL_REQ)
- 	$(RM) TclHaskellSrc/TclPrim.o
+-	$(RM) TclHaskellSrc/TclPrim.o
++	$(RM) TclHaskellSrc/TclPrim_.o
  
 +install_hugs :
 +	mkdir -p ${PREFIX}/lib/frantk/hugs/TclHaskellSrc

Modified: head/x11-toolkits/hs-frantk/pkg-descr
==============================================================================
--- head/x11-toolkits/hs-frantk/pkg-descr	Fri Aug  9 02:11:20 2013	(r324414)
+++ head/x11-toolkits/hs-frantk/pkg-descr	Fri Aug  9 02:48:34 2013	(r324415)
@@ -1,7 +1,7 @@
 FranTk (pronounced "frantic") is a library for building GUIs in Haskell. Its
 high level, provides good support for developing complex dynamic systems, and
-is built on top of Tcl-Tk. 
- 
-FranTk works with ghc and hugs98.
+is built on top of Tcl/Tk.
+
+FranTk works with GHC and Hugs 98.
 
 WWW: http://haskell.cs.yale.edu/FranTk/