From owner-svn-ports-all@freebsd.org Mon Apr 2 21:29:18 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B84EF865AD; Mon, 2 Apr 2018 21:29:18 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B305572F03; Mon, 2 Apr 2018 21:29:17 +0000 (UTC) (envelope-from mandree@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADEFA1B177; Mon, 2 Apr 2018 21:29:17 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32LTHwH008222; Mon, 2 Apr 2018 21:29:17 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32LTHEE008218; Mon, 2 Apr 2018 21:29:17 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201804022129.w32LTHEE008218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Mon, 2 Apr 2018 21:29:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466267 - in head/security: . putty putty-gtk2 putty-nogtk X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/security: . putty putty-gtk2 putty-nogtk X-SVN-Commit-Revision: 466267 X-SVN-Commit-Repository: ports 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.25 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, 02 Apr 2018 21:29:18 -0000 Author: mandree Date: Mon Apr 2 21:29:16 2018 New Revision: 466267 URL: https://svnweb.freebsd.org/changeset/ports/466267 Log: Reinstate support for GTK2 (rather than GTK3) as an OPTION. While here, add a putty-gtk2 slave port and update _CONFLICTS. Since the default package does not change, and pkg would handle conflicts around attempted installation of the new -gtk2 package, omit the PORTREVISION bump from Miroslav's original patch. PR: 227200 Submitted by: Miroslav Lachman Added: head/security/putty-gtk2/ head/security/putty-gtk2/Makefile (contents, props changed) Modified: head/security/Makefile head/security/putty-nogtk/Makefile head/security/putty/Makefile Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Mon Apr 2 21:19:51 2018 (r466266) +++ head/security/Makefile Mon Apr 2 21:29:16 2018 (r466267) @@ -868,6 +868,7 @@ SUBDIR += pulledpork SUBDIR += pure-sfv SUBDIR += putty + SUBDIR += putty-gtk2 SUBDIR += putty-nogtk SUBDIR += pvk SUBDIR += pwauth Added: head/security/putty-gtk2/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/putty-gtk2/Makefile Mon Apr 2 21:29:16 2018 (r466267) @@ -0,0 +1,13 @@ +# Created by: Matthias Andree +# $FreeBSD$ + +PKGNAMESUFFIX= -gtk2 + +OPTIONS_SLAVE= GTK2 +OPTIONS_EXCLUDE= GTK3 + +CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* putty-nogtk-[0-9]* + +MASTERDIR= ${.CURDIR}/../../security/putty + +.include "${MASTERDIR}/Makefile" Modified: head/security/putty-nogtk/Makefile ============================================================================== --- head/security/putty-nogtk/Makefile Mon Apr 2 21:19:51 2018 (r466266) +++ head/security/putty-nogtk/Makefile Mon Apr 2 21:29:16 2018 (r466267) @@ -3,9 +3,9 @@ PKGNAMESUFFIX= -nogtk -OPTIONS_EXCLUDE= GTK3 +OPTIONS_EXCLUDE= GTK2 GTK3 -CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* +CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* putty-gtk2-[0-9]* MASTERDIR= ${.CURDIR}/../../security/putty Modified: head/security/putty/Makefile ============================================================================== --- head/security/putty/Makefile Mon Apr 2 21:19:51 2018 (r466266) +++ head/security/putty/Makefile Mon Apr 2 21:29:16 2018 (r466267) @@ -23,27 +23,34 @@ CPE_VENDOR= simon_tatham PLIST_FILES= bin/plink bin/pscp bin/psftp bin/puttygen PLIST_FILES+= man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz -OPTIONS_DEFINE= GTK3 +OPTIONS_RADIO= TOOLKIT +OPTIONS_RADIO_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=GSSAPI_BASE GTK3 OPTIONS_SINGLE= GSSAPI_SELECT OPTIONS_SINGLE_GSSAPI_SELECT= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \ GSSAPI_MIT -CONFLICTS_INSTALL?= pssh-[0-9]* putty-nogtk-[0-9]* +CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]* .include CFLAGS+= -DBSD_PTYS -DOMIT_UTMP -DIPV6 LDFLAGS+= -Wl,--as-needed -.if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11) -USE_GNOME= cairo gdkpixbuf2 gtk30 +.if (${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}) && !defined(WITHOUT_X11) USE_XORG= x11 +.if ${PORT_OPTIONS:MGTK2} +USE_GNOME= cairo gdkpixbuf2 gtk20 +MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-2.0 x11 --cflags" +.endif +.if ${PORT_OPTIONS:MGTK3} +USE_GNOME= cairo gdkpixbuf2 gtk30 +MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags" +.endif PLIST_FILES+= bin/pageant bin/pterm bin/putty bin/puttytel PLIST_FILES+= man/man1/pageant.1.gz man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz PLIST_FILES+= share/pixmaps/putty.ico -MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags" DESKTOP_ENTRIES="PuTTY" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ @@ -91,9 +98,11 @@ post-patch: s,make,${MAKE_CMD},'\ ${WRKSRC}/${MAKEFILE} -post-install-GTK3-on: +post-install: +.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/../windows/putty.ico \ ${STAGEDIR}${PREFIX}/share/pixmaps/ +.endif .include