svn commit: r399431 - in head/net/irrd: . files

[Hajimu UMEMOTO]

Author: ume
Date: Fri Oct 16 11:13:50 2015
New Revision: 399431
URL: https://svnweb.freebsd.org/changeset/ports/399431

Log:
  - Fix pthread detection. [1]
  - Add LICENSE.
  - Use USES=tar:tgz.
  - OPTIONS'fy.
  - Don't hide install procedure.
  
  PR:		203792 [1]

Modified:
  head/net/irrd/Makefile
  head/net/irrd/files/patch-configure

Modified: head/net/irrd/Makefile
==============================================================================
--- head/net/irrd/Makefile	Fri Oct 16 10:26:04 2015	(r399430)
+++ head/net/irrd/Makefile	Fri Oct 16 11:13:50 2015	(r399431)
@@ -3,34 +3,33 @@
 
 PORTNAME=	irrd
 PORTVERSION=	2.3.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.irrd.net/
 DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ume at FreeBSD.org
 COMMENT=	Internet Routing Registry database server
 
+LICENSE=	BSD4CLAUSE
+LICENSE_FILE=	${WRKDIR}/${PORTNAME}${PORTVERSION}/COPYRIGHT
+
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/src
 
 IRRD_CONFDIR=	${PREFIX}/etc
 
-USES=		shebangfix
+USES=		shebangfix tar:tgz
 USE_RC_SUBR=	irrd
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC="${YACC}"
 MAKE_JOBS_UNSAFE=	yes
-#CONFIGURE_ARGS+=	--disable-thread
 DESTDIRNAME=	STAGEDIR
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+OPTIONS_DEFINE=		IPV6
+OPTIONS_DEFAULT=	IPV6
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 SHEBANG_FILES=	programs/irrdcacher/irrdcacher \
 		programs/irrdcacher/ripe2rpsl
@@ -63,13 +62,13 @@ post-patch:
 		${WRKSRC}/programs/irr_rpsl_submit/Makefile
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher \
+	${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher \
 		${STAGEDIR}${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl \
+	${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl \
 		${STAGEDIR}${PREFIX}/sbin
-	@${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample \
+	${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample \
 		${STAGEDIR}${IRRD_CONFDIR}
-	@${INSTALL_DATA} ${WRKSRC}/programs/IRRd/irrd.8 \
+	${INSTALL_DATA} ${WRKSRC}/programs/IRRd/irrd.8 \
 		${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>

Modified: head/net/irrd/files/patch-configure
==============================================================================
--- head/net/irrd/files/patch-configure	Fri Oct 16 10:26:04 2015	(r399430)
+++ head/net/irrd/files/patch-configure	Fri Oct 16 11:13:50 2015	(r399431)
@@ -1,6 +1,14 @@
---- configure.orig	2006-09-12 21:40:55.000000000 +0400
-+++ configure	2008-02-15 16:23:17.000000000 +0300
-@@ -6011,7 +6011,7 @@
+--- configure.orig	2006-09-12 17:40:55 UTC
++++ configure
+@@ -2638,7 +2638,6 @@
+                 THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+         fi
+ 	CRYPT_LIB="-lcrypt"
+-        ac_pthrlib="c_r"
+     ;;
+     linux* )
+ 	CRYPT_LIB="-lcrypt"
+@@ -6011,7 +6010,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */