From owner-svn-ports-head@FreeBSD.ORG Wed Jul 30 15:32:52 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CCC8BB74; Wed, 30 Jul 2014 15:32:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 AB7842F24; Wed, 30 Jul 2014 15:32:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6UFWqpZ083399; Wed, 30 Jul 2014 15:32:52 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6UFWqUr083396; Wed, 30 Jul 2014 15:32:52 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407301532.s6UFWqUr083396@svn.freebsd.org> From: William Grzybowski Date: Wed, 30 Jul 2014 15:32:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363487 - 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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2014 15:32:53 -0000 Author: wg Date: Wed Jul 30 15:32:51 2014 New Revision: 363487 URL: http://svnweb.freebsd.org/changeset/ports/363487 QAT: https://qat.redports.org/buildarchive/r363487/ Log: net-p2p/uhub: update to 0.4.1 - Support stage - Use options helpers PR: 192213 Submitted by: tkato432 yahoo com Deleted: head/net-p2p/uhub/files/patch-GNUmakefile Modified: head/net-p2p/uhub/Makefile head/net-p2p/uhub/distinfo head/net-p2p/uhub/pkg-plist Modified: head/net-p2p/uhub/Makefile ============================================================================== --- head/net-p2p/uhub/Makefile Wed Jul 30 15:24:57 2014 (r363486) +++ head/net-p2p/uhub/Makefile Wed Jul 30 15:32:51 2014 (r363487) @@ -2,68 +2,65 @@ # $FreeBSD$ PORTNAME= uhub -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.4.1 +DISTVERSIONSUFFIX= -src CATEGORIES= net-p2p MASTER_SITES= http://www.extatic.org/downloads/uhub/ -DISTFILES= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= High performance peer-to-peer hub for the ADC network LICENSE= GPLv3 -USES= gmake perl5 -USE_PERL5= build -USE_SQLITE= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_RC_SUBR= uhub USERS= uhub GROUPS= uhub -SHAREGRP= uhub -SHAREMODE= 640 - -MAKEFILE= ${WRKSRC}/GNUmakefile - -OPTIONS_DEFINE= DEBUG OPENSSL -OPENSSL_DESC= Enable OpenSSL Support (experimental) -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -MAKE_ARGS+= USE_SSL=YES -.else -MAKE_ARGS+= USE_SSL=NO -.endif +USES= cmake perl5 +USE_RC_SUBR= uhub +USE_PERL5= build -.if ${PORT_OPTIONS:MDEBUG} -CFLAGS+= -ggdb -DDEBUG -.else -CFLAGS+= -DNDEBUG -.endif +CFLAGS+= -fPIC -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -.include +OPTIONS_DEFINE= OPENSSL SQLITE +OPTIONS_DEFAULT= OPENSSL SQLITE +OPTIONS_SUB= yes + +OPENSSL_USE= openssl=yes +OPENSSL_CMAKE_OFF= -DSSL_SUPPORT:BOOL=OFF +SQLITE_USE= sqlite=yes +SQLITE_CMAKE_OFF= -DSQLITE_SUPPORT:BOOL=OFF -CFLAGS+= -I./src/ -I${LOCALBASE}/include -MAKE_ARGS+= UHUB_PREFIX="${PREFIX}" UHUB_CONF_DIR="${PREFIX}/etc/uhub" \ - SILENT=NO CC="${CC}" CFLAGS="${CFLAGS}" +.include post-patch: - @${REINPLACE_CMD} -e 's|/etc/uhub/|${PREFIX}&|' ${WRKSRC}/doc/uhub.conf - @${REINPLACE_CMD} -e 's|/etc/uhub/|${PREFIX}&|' ${WRKSRC}/src/uhub.h + @${REINPLACE_CMD} -e \ + '/DESTINATION/s|^|#|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + 's| /usr/lib/| ${PREFIX}/lib/|g ; \ + s|=/etc/uhub/|=${ETCDIR}/|g' ${WRKSRC}/doc/uhub.conf + @${REINPLACE_CMD} -e \ + 's|"/etc/uhub/|"${ETCDIR}/|' ${WRKSRC}/src/uhub.h do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/uhub ${PREFIX}/bin/uhub - @${MKDIR} ${PREFIX}/etc/uhub - @${INSTALL_DATA} ${WRKSRC}/doc/uhub.conf ${PREFIX}/etc/uhub/uhub.conf.sample - @${INSTALL_DATA} ${WRKSRC}/doc/users.conf ${PREFIX}/etc/uhub/users.conf.sample - @${INSTALL_DATA} /dev/null ${PREFIX}/etc/uhub/motd.txt.sample - @${INSTALL_DATA} /dev/null ${PREFIX}/etc/uhub/rules.txt.sample -.for i in uhub.conf users.conf motd.txt rules.txt - @[ ! -f ${PREFIX}/etc/uhub/${i} ] \ - && ${CP} -p ${PREFIX}/etc/uhub/${i}.sample ${PREFIX}/etc/uhub/${i} + (cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} uhub \ + ${STAGEDIR}${PREFIX}/bin) +.if ${PORT_OPTIONS:MSQLITE} + (cd ${INSTALL_WRKSRC} && ${INSTALL_PROGRAM} uhub-passwd \ + ${STAGEDIR}${PREFIX}/bin) +.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/uhub + (cd ${INSTALL_WRKSRC} && ${INSTALL_LIB} 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) +.endfor +.for i in motd.txt rules.txt + @${ECHO_CMD} -n > ${STAGEDIR}${ETCDIR}/${i}.sample .endfor -.include +.include Modified: head/net-p2p/uhub/distinfo ============================================================================== --- head/net-p2p/uhub/distinfo Wed Jul 30 15:24:57 2014 (r363486) +++ head/net-p2p/uhub/distinfo Wed Jul 30 15:32:51 2014 (r363487) @@ -1,2 +1,2 @@ -SHA256 (uhub-0.4.0-src.tar.gz) = e6f4c35bb5d5ff973ca2428a0432d6545b6f38f08387697cf05b608b5c4525ac -SIZE (uhub-0.4.0-src.tar.gz) = 194568 +SHA256 (uhub-0.4.1-src.tar.gz) = c2985e4136b2c8e43ddfe10f28545162e94a8ec93d107dd7254478edc79a2eee +SIZE (uhub-0.4.1-src.tar.gz) = 203394 Modified: head/net-p2p/uhub/pkg-plist ============================================================================== --- head/net-p2p/uhub/pkg-plist Wed Jul 30 15:24:57 2014 (r363486) +++ head/net-p2p/uhub/pkg-plist Wed Jul 30 15:32:51 2014 (r363487) @@ -1,14 +1,21 @@ bin/uhub -@unexec if cmp -s %D/etc/uhub/uhub.conf.sample %D/etc/uhub/uhub.conf; then rm -f %D/etc/uhub/uhub.conf; fi -etc/uhub/uhub.conf.sample -@exec if [ ! -f %D/etc/uhub/uhub.conf ] ; then cp -p %D/%F %B/uhub.conf; fi -@unexec if cmp -s %D/etc/uhub/users.conf.sample %D/etc/uhub/users.conf; then rm -f %D/etc/uhub/users.conf; fi -etc/uhub/users.conf.sample -@exec if [ ! -f %D/etc/uhub/users.conf ] ; then cp -p %D/%F %B/users.conf; fi -@unexec if cmp -s %D/etc/uhub/motd.txt.sample %D/etc/uhub/motd.txt; then rm -f %D/etc/uhub/motd.txt; fi -etc/uhub/motd.txt.sample -@exec if [ ! -f %D/etc/uhub/motd.txt ] ; then cp -p %D/%F %B/motd.txt; fi -@unexec if cmp -s %D/etc/uhub/rules.txt.sample %D/etc/uhub/rules.txt; then rm -f %D/etc/uhub/rules.txt; fi -etc/uhub/rules.txt.sample -@exec if [ ! -f %D/etc/uhub/rules.txt ] ; then cp -p %D/%F %B/rules.txt; fi -@dirrmtry etc/uhub +%%SQLITE%%bin/uhub-passwd +@group uhub +@mode 640 +@sample %%ETCDIR%%/motd.txt.sample +@sample %%ETCDIR%%/rules.txt.sample +@sample %%ETCDIR%%/uhub.conf.sample +@sample %%ETCDIR%%/users.conf.sample +@mode +@group +lib/uhub/mod_auth_simple.so +%%SQLITE%%lib/uhub/mod_auth_sqlite.so +lib/uhub/mod_chat_history.so +lib/uhub/mod_chat_only.so +lib/uhub/mod_example.so +lib/uhub/mod_logging.so +lib/uhub/mod_no_guest_downloads.so +lib/uhub/mod_topic.so +lib/uhub/mod_welcome.so +@dirrm lib/uhub +@dirrm %%ETCDIR%%