svn commit: r360232 - in head/www/gist: . files

[Danilo Egea Gondolfo]

Author: danilo
Date: Wed Jul  2 17:35:35 2014
New Revision: 360232
URL: http://svnweb.freebsd.org/changeset/ports/360232
QAT: https://qat.redports.org/buildarchive/r360232/

Log:
  - Update from 3.1.0 to 4.2.1
  - Add LICENSE
  - Remove OPTIONS
  
  PR:		ports/191483
  Submitted by:	changlp at cs.nctu.edu.tw

Added:
  head/www/gist/files/patch-build-gist   (contents, props changed)
Deleted:
  head/www/gist/files/extrapatch-cert-gist
  head/www/gist/files/extrapatch-nssca-gist
Modified:
  head/www/gist/Makefile
  head/www/gist/distinfo

Modified: head/www/gist/Makefile
==============================================================================
--- head/www/gist/Makefile	Wed Jul  2 17:35:20 2014	(r360231)
+++ head/www/gist/Makefile	Wed Jul  2 17:35:35 2014	(r360232)
@@ -2,23 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	gist
-PORTVERSION=	3.1.0
-PORTREVISION=	4
+PORTVERSION=	4.2.1
 CATEGORIES=	www net
 
 MAINTAINER=	changlp at cs.nctu.edu.tw
 COMMENT=	Gist pastebin posting command
 
-OPTIONS_DEFINE=	NSSCA
-NSSCA_DESC=	Use certificates provided in security/ca_root_nss
-.include <bsd.port.options.mk>
+LICENSE=	MIT
+
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS=	p5-App-gist-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	defunkt
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	82ffb80
+GH_COMMIT=	82fe83c
 
 USE_RUBY=	YES
 RUBY_NO_BUILD_DEPENDS=	YES
@@ -29,21 +28,11 @@ PLIST_FILES=	bin/gist \
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MNSSCA}
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-EXTRA_PATCHES=	${PATCHDIR}/extrapatch-nssca-gist
-.else
-EXTRA_PATCHES=	${PATCHDIR}/extrapatch-cert-gist
-.endif
-
-.if ${PORT_OPTIONS:MNSSCA}
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/gist
-.endif
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build/gist
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/gist ${STAGEDIR}${PREFIX}/bin/gist
-	${INSTALL_MAN} ${WRKSRC}/man/gist.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/build/gist ${STAGEDIR}${PREFIX}/bin/gist
+	${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.post.mk>

Modified: head/www/gist/distinfo
==============================================================================
--- head/www/gist/distinfo	Wed Jul  2 17:35:20 2014	(r360231)
+++ head/www/gist/distinfo	Wed Jul  2 17:35:35 2014	(r360232)
@@ -1,2 +1,2 @@
-SHA256 (gist-3.1.0.tar.gz) = d26149363ad7529fe408ce810401ef6bbfbb2c4dc4bff9adbc80862c04cbaa47
-SIZE (gist-3.1.0.tar.gz) = 699830
+SHA256 (gist-4.2.1.tar.gz) = 16acd27ff4ed2ee74e8c4012360891b709c1719fc16a8ed2d4a7b943c005abaa
+SIZE (gist-4.2.1.tar.gz) = 34951

Added: head/www/gist/files/patch-build-gist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gist/files/patch-build-gist	Wed Jul  2 17:35:35 2014	(r360232)
@@ -0,0 +1,12 @@
+--- build/gist	2014-06-29 23:42:21.158933799 +0800
++++ build/gist.ssl	2014-06-29 23:42:09.848935272 +0800
+@@ -1536,7 +1536,8 @@
+                  end
+     if uri.scheme == "https"
+       connection.use_ssl = true
+-      connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
++      connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
++      connection.ca_file = "%%LOCALBASE%%/share/certs/ca-root-nss.crt"
+     end
+     connection.open_timeout = 10
+     connection.read_timeout = 10