From owner-svn-ports-head@freebsd.org Fri Feb 1 14:57:37 2019 Return-Path: Delivered-To: svn-ports-head@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 D0CF014B5AFA; Fri, 1 Feb 2019 14:57:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 71DDE6B58E; Fri, 1 Feb 2019 14:57:37 +0000 (UTC) (envelope-from tobik@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 5D44B20778; Fri, 1 Feb 2019 14:57:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x11Evbpg095378; Fri, 1 Feb 2019 14:57:37 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x11EvbNE095377; Fri, 1 Feb 2019 14:57:37 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201902011457.x11EvbNE095377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 1 Feb 2019 14:57:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491822 - head/games/macopix X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/macopix X-SVN-Commit-Revision: 491822 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 71DDE6B58E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 01 Feb 2019 14:57:38 -0000 Author: tobik Date: Fri Feb 1 14:57:36 2019 New Revision: 491822 URL: https://svnweb.freebsd.org/changeset/ports/491822 Log: games/macopix: Remove GTK1 option x11-toolkits/gtk12 is gone since r488008. Convert to options helpers too while here. Modified: head/games/macopix/Makefile Modified: head/games/macopix/Makefile ============================================================================== --- head/games/macopix/Makefile Fri Feb 1 14:54:44 2019 (r491821) +++ head/games/macopix/Makefile Fri Feb 1 14:57:36 2019 (r491822) @@ -3,7 +3,7 @@ PORTNAME= macopix PORTVERSION= 1.7.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES} @@ -34,39 +34,22 @@ RESTRICTED_FILES= \ macopix-mascot-marimite-euc-ja-2.20.tar.gz \ macopix-mascot-HxB-euc-ja-0.30.tar.gz -USES= gettext gmake iconv jpeg libtool pkgconfig +USES= gettext gmake gnome iconv jpeg libtool pkgconfig +USE_GNOME= gtk20 USE_XORG= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lX11 ${ICONV_LIB} -OPTIONS_DEFINE= DOCS GNUTLS GTK1 +OPTIONS_DEFINE= DOCS GNUTLS GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls +GNUTLS_USES_OFF= ssl -GTK1_USE= GNOME=gtk12,gdkpixbuf -GTK1_CONFIGURE_ON= --with-gtk1 - -.include - -.if ! ${PORT_OPTIONS:MGNUTLS} -USES+= ssl -.endif - -.if ${PORT_OPTIONS:MGTK1} -PKGNAMESUFFIX= -gtk1 -.else -USE_GNOME+= gtk20 -.endif - post-patch: @${REINPLACE_CMD} -e 's/_MAIL } MailStatus/_MAIL } MailStatus2/' ${WRKSRC}/src/main.h -.if ${PORT_OPTIONS:MGTK1} - @${REINPLACE_CMD} 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' \ - ${WRKSRC}/src/nokkari.c -.endif post-install: # install mascot file