kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reinstate support for GTK2 (rather than GTK3) as an OPTION.

Browse source 
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
This commit is contained in:
Matthias Andree 2018-04-02 21:29:16 +00:00
parent fc56cb26ab
commit 7ed8c3e354
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=466267
4 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
security/Makefile
View file

@ -868,6 +868,7 @@
SUBDIR += pulledpork
SUBDIR += pure-sfv
SUBDIR += putty
SUBDIR += putty-gtk2
SUBDIR += putty-nogtk
SUBDIR += pvk
SUBDIR += pwauth

13
security/putty-gtk2/Makefile Normal file
View file

@ -0,0 +1,13 @@
# Created by: Matthias Andree <mandree@FreeBSD.org>
# $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"

4
security/putty-nogtk/Makefile
View file

@ -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

21
security/putty/Makefile
View file

@ -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 <bsd.port.options.mk>
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 <bsd.port.mk>