From owner-svn-ports-all@freebsd.org Mon Mar 7 09:59: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 88703A95CAC; Mon, 7 Mar 2016 09:59:57 +0000 (UTC) (envelope-from danfe@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 4A1FA6A0; Mon, 7 Mar 2016 09:59:57 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u279xucS063537; Mon, 7 Mar 2016 09:59:56 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u279xugY063534; Mon, 7 Mar 2016 09:59:56 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201603070959.u279xugY063534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 7 Mar 2016 09:59:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410512 - in head/x11/cool-retro-term: . 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.21 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: Mon, 07 Mar 2016 09:59:57 -0000 Author: danfe Date: Mon Mar 7 09:59:55 2016 New Revision: 410512 URL: https://svnweb.freebsd.org/changeset/ports/410512 Log: - Since our GitHub-hosted distfile support understands external projects, use it instead of storing manually-fetched distfile in `local-distfiles', - Remove bogus USE_LDCONFIG knob and avoid symlinking to an absolute path - As support for some older FreeBSD versions was removed in r398738, merge in-place alteration of the `qmltermwidget/lib/kpty.cpp' file (previously conditional) into existing patch Modified: head/x11/cool-retro-term/Makefile head/x11/cool-retro-term/distinfo head/x11/cool-retro-term/files/patch-lib_kpty.cpp Modified: head/x11/cool-retro-term/Makefile ============================================================================== --- head/x11/cool-retro-term/Makefile Mon Mar 7 09:49:52 2016 (r410511) +++ head/x11/cool-retro-term/Makefile Mon Mar 7 09:59:55 2016 (r410512) @@ -5,9 +5,6 @@ PORTNAME= cool-retro-term PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v CATEGORIES= x11 -MASTER_SITES= LOCAL/danfe:qtw -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - qmltermwidget-0.1.0${EXTRACT_SUFX}:qtw MAINTAINER= danfe@FreeBSD.org COMMENT= Terminal emulator which mimics the old cathode display @@ -16,11 +13,12 @@ LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= Swordfish90 +GH_PROJECT= qmltermwidget:qtw +GH_TAGNAME= v0.1.0:qtw USES= desktop-file-utils qmake USE_QT5= qmake_build buildtools_build core gui qml quick widgets \ graphicaleffects_run quickcontrols_run -USE_LDCONFIG= yes .include @@ -34,13 +32,11 @@ CPP= clang-cpp post-extract: @${RMDIR} ${WRKSRC}/qmltermwidget - @${LN} -s ${WRKDIR}/qmltermwidget-0.1.0 ${WRKSRC}/qmltermwidget + @${LN} -s ../qmltermwidget-0.1.0 ${WRKSRC}/qmltermwidget post-patch: @${REINPLACE_CMD} -e '/DEFINES +=/s,^macx:,,' \ ${WRKSRC}/qmltermwidget/qmltermwidget.pro - @${REINPLACE_CMD} -e '/define HAVE_LOGIN/d' \ - ${WRKSRC}/qmltermwidget/lib/kpty.cpp @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ ${WRKSRC}/app/app.pro ${WRKSRC}/cool-retro-term.pro @${REINPLACE_CMD} -e 's,\.\./icons,/icons,' \ Modified: head/x11/cool-retro-term/distinfo ============================================================================== --- head/x11/cool-retro-term/distinfo Mon Mar 7 09:49:52 2016 (r410511) +++ head/x11/cool-retro-term/distinfo Mon Mar 7 09:59:55 2016 (r410512) @@ -1,4 +1,4 @@ SHA256 (Swordfish90-cool-retro-term-v1.0.0_GH0.tar.gz) = db799084680545b6961e1b3d1bb7ff0cb8105e82279fe734c2c07c32525350d9 SIZE (Swordfish90-cool-retro-term-v1.0.0_GH0.tar.gz) = 7809236 -SHA256 (qmltermwidget-0.1.0.tar.gz) = 127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9 -SIZE (qmltermwidget-0.1.0.tar.gz) = 196864 +SHA256 (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 127f529a96cf1c96ff201c79458cff67f497b1820b04b0b30cb473423ccb30f9 +SIZE (Swordfish90-qmltermwidget-v0.1.0_GH0.tar.gz) = 196864 Modified: head/x11/cool-retro-term/files/patch-lib_kpty.cpp ============================================================================== --- head/x11/cool-retro-term/files/patch-lib_kpty.cpp Mon Mar 7 09:49:52 2016 (r410511) +++ head/x11/cool-retro-term/files/patch-lib_kpty.cpp Mon Mar 7 09:59:55 2016 (r410512) @@ -1,6 +1,15 @@ --- qmltermwidget/lib/kpty.cpp.orig +++ qmltermwidget/lib/kpty.cpp -@@ -84,9 +83,10 @@ extern "C" { +@@ -28,7 +28,7 @@ + + + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +-#define HAVE_LOGIN ++//#define HAVE_LOGIN + #define HAVE_LIBUTIL_H + #endif + +@@ -84,9 +84,10 @@ extern "C" { # include } #else @@ -12,7 +21,7 @@ # endif # if !defined(_PATH_UTMPX) && defined(_UTMPX_FILE) # define _PATH_UTMPX _UTMPX_FILE -@@ -503,7 +503,7 @@ void KPty::login(const char * user, cons +@@ -503,7 +504,7 @@ void KPty::login(const char * user, cons // note: strncpy without terminators _is_ correct here. man 4 utmp if (user) { @@ -21,7 +30,7 @@ } if (remotehost) { -@@ -550,7 +550,7 @@ void KPty::login(const char * user, cons +@@ -550,7 +551,7 @@ void KPty::login(const char * user, cons # endif # endif # ifdef HAVE_UTMPX @@ -30,7 +39,7 @@ setutxent(); pututxline(&l_struct); endutxent(); -@@ -606,7 +606,7 @@ void KPty::logout() +@@ -606,7 +607,7 @@ void KPty::logout() strncpy(l_struct.ut_line, str_ptr, sizeof(l_struct.ut_line)); # ifdef HAVE_UTMPX @@ -39,7 +48,7 @@ setutxent(); if ((ut = getutxline(&l_struct))) { # else -@@ -614,7 +614,7 @@ void KPty::logout() +@@ -614,7 +615,7 @@ void KPty::logout() setutent(); if ((ut = getutline(&l_struct))) { # endif