svn commit: r320466 - in head/ftp/rexx-curl: . files

[Andrej Zverev]

Author: az
Date: Mon Jun 10 12:26:23 2013
New Revision: 320466
URL: http://svnweb.freebsd.org/changeset/ports/320466

Log:
  - Fix build
  - Trim Makefile
  - NOPORTDOCS -> PORT_OPTIONS:MDOCS
  
  PR:		ports/179439
  Submitted by:	John Marino <draco at marino.st>

Added:
  head/ftp/rexx-curl/files/patch-configure   (contents, props changed)
Modified:
  head/ftp/rexx-curl/Makefile

Modified: head/ftp/rexx-curl/Makefile
==============================================================================
--- head/ftp/rexx-curl/Makefile	Mon Jun 10 12:12:21 2013	(r320465)
+++ head/ftp/rexx-curl/Makefile	Mon Jun 10 12:26:23 2013	(r320466)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	rexx-curl
-# Date created:			Nov 11, 2003
-# Whom:	      			ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	curl
 PORTVERSION=	1.4
@@ -18,10 +13,9 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	External function package providing an interface to the cURL package
 
 BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
 
-BROKEN=		fails to build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${PTHREAD_CFLAGS}
@@ -32,12 +26,14 @@ USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/rexx${PORTNAME}
 DATADIR=	${PREFIX}/share/rexx${PORTNAME}
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e "s| -lc | |g" -e "/\$(sharedir)\/images/d" \
 		-e "/index.html/d" -e "/rxcurl64.png/d" ${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/images

Added: head/ftp/rexx-curl/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/rexx-curl/files/patch-configure	Mon Jun 10 12:26:23 2013	(r320466)
@@ -0,0 +1,16 @@
+--- configure.orig	2005-07-28 11:01:07.000000000 +0000
++++ configure
+@@ -6240,8 +6240,12 @@ case "$target" in
+ 		LD_RXLIB1="${CC} -shared"
+ 		LD_RXTRANSLIB1="$LD_RXLIB1"
+ 		;;
++	*dragonfly*)
++		LD_RXLIB1="${CC} -shared"
++		LD_RXTRANSLIB1="$LD_RXLIB1"
++		;;
+ 	*freebsd*)
+-		LD_RXLIB1="ld -Bdynamic -Bshareable"
++		LD_RXLIB1="${CC} -shared"
+ 		LD_RXTRANSLIB1="$LD_RXLIB1"
+ 		;;
+ 	*pc-sco*)