From owner-svn-ports-all@freebsd.org Wed Aug 17 21:36:57 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69D4FBBD6B6; Wed, 17 Aug 2016 21:36:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 418521F8D; Wed, 17 Aug 2016 21:36:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7HLaut4029267; Wed, 17 Aug 2016 21:36:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HLauBa029264; Wed, 17 Aug 2016 21:36:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608172136.u7HLauBa029264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 17 Aug 2016 21:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420374 - in head/net-p2p/uhub: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2016 21:36:57 -0000 Author: amdmi3 Date: Wed Aug 17 21:36:55 2016 New Revision: 420374 URL: https://svnweb.freebsd.org/changeset/ports/420374 Log: - Clarify LICENSE - Add LICENSE_FILE - Drop uneeded flags - Remove SQLITE option, sqlite support is not conditional - Switch to opt_CMAKE_BOOL - Simplify installation Modified: head/net-p2p/uhub/Makefile head/net-p2p/uhub/files/patch-src__network__openssl.c head/net-p2p/uhub/pkg-plist Modified: head/net-p2p/uhub/Makefile ============================================================================== --- head/net-p2p/uhub/Makefile Wed Aug 17 21:19:42 2016 (r420373) +++ head/net-p2p/uhub/Makefile Wed Aug 17 21:36:55 2016 (r420374) @@ -10,30 +10,26 @@ MASTER_SITES= http://www.extatic.org/dow MAINTAINER= ports@FreeBSD.org COMMENT= High performance peer-to-peer hub for the ADC network -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USERS= uhub -GROUPS= uhub - -USES= cmake perl5 +USES= cmake perl5 sqlite USE_RC_SUBR= uhub USE_PERL5= build -CFLAGS+= -fPIC -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USERS= uhub +GROUPS= uhub + +CFLAGS+= -fPIC -OPTIONS_DEFINE= OPENSSL SQLITE +OPTIONS_DEFINE= OPENSSL OPTIONS_DEFAULT= OPENSSL SQLITE OPTIONS_SUB= yes -OPENSSL_USE= openssl=yes -OPENSSL_CMAKE_OFF= -DSSL_SUPPORT:BOOL=OFF -SQLITE_USES= sqlite -SQLITE_CMAKE_OFF= -DSQLITE_SUPPORT:BOOL=OFF - -.include +OPENSSL_USES= ssl +OPENSSL_CMAKE_BOOL= SSL_SUPPORT post-patch: @${REINPLACE_CMD} -e \ @@ -45,19 +41,13 @@ post-patch: 's|"/etc/uhub/|"${ETCDIR}/|' ${WRKSRC}/src/uhub.h do-install: - (cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} uhub \ - ${STAGEDIR}${PREFIX}/bin) -.if ${PORT_OPTIONS:MSQLITE} - (cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} uhub-passwd \ - ${STAGEDIR}${PREFIX}/bin) -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/uhub ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/uhub-passwd ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/lib/uhub - (cd ${INSTALL_WRKSRC} && ${INSTALL_LIB} mod_*.so \ - ${STAGEDIR}${PREFIX}/lib/uhub) + ${INSTALL_LIB} ${WRKSRC}/mod_*.so ${STAGEDIR}${PREFIX}/lib/uhub @${MKDIR} ${STAGEDIR}${ETCDIR} .for i in uhub.conf users.conf - (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${ETCDIR}/${i}.sample) + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${ETCDIR}/${i}.sample .endfor .for i in motd.txt rules.txt @${ECHO_CMD} -n > ${STAGEDIR}${ETCDIR}/${i}.sample Modified: head/net-p2p/uhub/files/patch-src__network__openssl.c ============================================================================== --- head/net-p2p/uhub/files/patch-src__network__openssl.c Wed Aug 17 21:19:42 2016 (r420373) +++ head/net-p2p/uhub/files/patch-src__network__openssl.c Wed Aug 17 21:36:55 2016 (r420374) @@ -1,6 +1,6 @@ ---- src/network/openssl.c.orig +--- src/network/openssl.c.orig 2014-08-06 18:56:07 UTC +++ src/network/openssl.c -@@ -106,10 +106,12 @@ +@@ -106,10 +106,12 @@ static const SSL_METHOD* get_ssl_method( if (!strcmp(tls_version, "1.0")) return TLSv1_method(); Modified: head/net-p2p/uhub/pkg-plist ============================================================================== --- head/net-p2p/uhub/pkg-plist Wed Aug 17 21:19:42 2016 (r420373) +++ head/net-p2p/uhub/pkg-plist Wed Aug 17 21:36:55 2016 (r420374) @@ -1,13 +1,13 @@ bin/uhub -%%SQLITE%%bin/uhub-passwd +bin/uhub-passwd @sample(,uhub,0640) %%ETCDIR%%/motd.txt.sample @sample(,uhub,0640) %%ETCDIR%%/rules.txt.sample @sample(,uhub,0640) %%ETCDIR%%/uhub.conf.sample @sample(,uhub,0640) %%ETCDIR%%/users.conf.sample lib/uhub/mod_auth_simple.so -%%SQLITE%%lib/uhub/mod_auth_sqlite.so +lib/uhub/mod_auth_sqlite.so lib/uhub/mod_chat_history.so -%%SQLITE%%lib/uhub/mod_chat_history_sqlite.so +lib/uhub/mod_chat_history_sqlite.so lib/uhub/mod_chat_only.so lib/uhub/mod_example.so lib/uhub/mod_logging.so