From owner-svn-ports-all@FreeBSD.ORG Tue Apr 15 08:55:53 2014 Return-Path: Delivered-To: svn-ports-all@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 338E14BB; Tue, 15 Apr 2014 08:55:53 +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 1ED5C1D87; Tue, 15 Apr 2014 08:55:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3F8tqEa032053; Tue, 15 Apr 2014 08:55:52 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3F8tqSH032051; Tue, 15 Apr 2014 08:55:52 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404150855.s3F8tqSH032051@svn.freebsd.org> From: Pawel Pekala Date: Tue, 15 Apr 2014 08:55:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351314 - head/games/macopix 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.17 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: Tue, 15 Apr 2014 08:55:53 -0000 Author: pawel Date: Tue Apr 15 08:55:52 2014 New Revision: 351314 URL: http://svnweb.freebsd.org/changeset/ports/351314 QAT: https://qat.redports.org/buildarchive/r351314/ Log: - Add staging support - Convert to new LIB_DEPENDS format, option framework - Fix build when GTK1=on Modified: head/games/macopix/Makefile head/games/macopix/pkg-plist Modified: head/games/macopix/Makefile ============================================================================== --- head/games/macopix/Makefile Tue Apr 15 08:14:22 2014 (r351313) +++ head/games/macopix/Makefile Tue Apr 15 08:55:52 2014 (r351314) @@ -11,9 +11,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ MAINTAINER= ports@FreeBSD.org COMMENT= Window sitter for X11 -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libtiff.so:${PORTSDIR}/graphics/tiff RESTRICTED= 'contains commercial character data' @@ -33,77 +33,81 @@ WANT_GNOME= yes USES= gettext gmake iconv pkgconfig GNU_CONFIGURE= yes -MAN1= macopix.1 - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -.if defined(WITH_GNUTLS) -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-gnutls -.else +OPTIONS_DEFINE= DOCS GNUTLS GTK1 + +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_ON= --with-gnutls + +GTK1_USE= GNOME=gtk12,gdkpixbuf +GTK1_CONFIGURE_ON= --with-gtk1 + +.include + +.if ! ${PORT_OPTIONS:MGNUTLS} USE_OPENSSL= yes .endif -.if defined(WITH_GTK1) +.if ${PORT_OPTIONS:MGTK1} PKGNAMESUFFIX= -gtk1 -USE_GNOME+= gtk12 gdkpixbuf -CONFIGURE_ARGS+= --with-gtk1 .else USE_GNOME+= gtk20 .endif -NO_STAGE= yes 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 - ${MKDIR} ${DATADIR}/pixmap + @${MKDIR} ${STAGEDIR}${DATADIR}/pixmap cd ${WRKDIR}/macopix-mascot-comic_party-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.comipa.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.comipa.jp cd ${WRKDIR}/macopix-mascot-cosmos-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.cosmos.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.cosmos.jp cd ${WRKDIR}/macopix-mascot-kanon-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.kanon.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.kanon.jp cd ${WRKDIR}/macopix-mascot-mizuiro-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.mizuiro.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.mizuiro.jp cd ${WRKDIR}/macopix-mascot-one-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.one.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.one.jp cd ${WRKDIR}/macopix-mascot-pia2-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.pia2.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.pia2.jp cd ${WRKDIR}/macopix-mascot-triangle_heart-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.trh.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.trh.jp cd ${WRKDIR}/macopix-mascot-tsukihime-euc-ja-1.02 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.tsuki.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.tsuki.jp cd ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.20 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.marimite.jp + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.marimite.jp cd ${WRKDIR}/macopix-mascot-HxB-euc-ja-0.30 \ - && ${INSTALL_DATA} *.png ${DATADIR}/pixmap \ - && ${INSTALL_DATA} *.mcpx *.menu ${DATADIR} \ - && ${INSTALL_DATA} README.jp ${DATADIR}/README.HxB.jp -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} \ - && ${INSTALL_MAN} NKR.README.ja README README.ja ${DOCSDIR} -.endif + && ${INSTALL_DATA} *.png ${STAGEDIR}${DATADIR}/pixmap \ + && ${INSTALL_DATA} *.mcpx *.menu ${STAGEDIR}${DATADIR} \ + && ${INSTALL_DATA} README.jp ${STAGEDIR}${DATADIR}/README.HxB.jp + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_MAN} NKR.README.ja README README.ja \ + ${STAGEDIR}${DOCSDIR} .include Modified: head/games/macopix/pkg-plist ============================================================================== --- head/games/macopix/pkg-plist Tue Apr 15 08:14:22 2014 (r351313) +++ head/games/macopix/pkg-plist Tue Apr 15 08:55:52 2014 (r351314) @@ -1,4 +1,5 @@ bin/macopix +man/man1/macopix.1.gz %%PORTDOCS%%%%DOCSDIR%%/NKR.README.ja %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.ja