From owner-svn-ports-all@freebsd.org Wed Aug 17 11:47:44 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 86D13BBC761; Wed, 17 Aug 2016 11:47:44 +0000 (UTC) (envelope-from amdmi3@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 3E2B71C78; Wed, 17 Aug 2016 11:47:44 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7HBlhTu006004; Wed, 17 Aug 2016 11:47:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7HBlhRJ006003; Wed, 17 Aug 2016 11:47:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608171147.u7HBlhRJ006003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 17 Aug 2016 11:47:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420336 - head/graphics/comical 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.22 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: Wed, 17 Aug 2016 11:47:44 -0000 Author: amdmi3 Date: Wed Aug 17 11:47:43 2016 New Revision: 420336 URL: https://svnweb.freebsd.org/changeset/ports/420336 Log: - Pet portlint - Drop unneeded WX_UNICODE - Silence patching and stripping - Remove always-true (since wx 2.6 removal) condition Modified: head/graphics/comical/Makefile Modified: head/graphics/comical/Makefile ============================================================================== --- head/graphics/comical/Makefile Wed Aug 17 11:46:12 2016 (r420335) +++ head/graphics/comical/Makefile Wed Aug 17 11:47:43 2016 (r420336) @@ -10,30 +10,27 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Sequential image viewer -LIB_DEPENDS= libunrar.so:archivers/libunrar - LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libunrar.so:archivers/libunrar + MAKE_JOBS_UNSAFE= yes USES= gmake -USE_WX= 2.6+ -WX_PREMK= yes -WX_UNICODE= yes -PLIST_FILES= bin/comical +USE_WX= 2.8+ -.include +PLIST_FILES= bin/comical post-patch: - ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ s|\`wx-config --cxx\`|${CXX}|; \ s|wx-config|${WX_CONFIG}|; \ s|unrar/libunrar.a u|u|; \ s|-lunrar|-L${LOCALBASE}/lib -lunrar|;' \ ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|; \ + @${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|; \ s|-D_UNIX|-D_UNIX -DwxUSE_UNICODE|; \ s|CFLAGS =|CFLAGS=${CFLAGS} |; \ s|CPPFLAGS =|CPPFLAGS=${CXXFLAGS} |; \ @@ -41,16 +38,14 @@ post-patch: s|-I../unrar|-I${LOCALBASE}/include/libunrar3|;' \ ${WRKSRC}/src/Makefile - ${REINPLACE_CMD} -e 's|gcc|${CC}|; \ + @${REINPLACE_CMD} -e 's|gcc|${CC}|; \ s|CFLAGS=|CFLAGS+=|;' \ ${WRKSRC}/unzip/Makefile -.if ${WX_VERSION} == "2.8" - ${REINPLACE_CMD} -e 's|frame->SetIcon|//frame->SetIcon|' \ + @${REINPLACE_CMD} -e 's|frame->SetIcon|//frame->SetIcon|' \ ${WRKSRC}/src/ComicalApp.cpp -.endif post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.include +.include