From owner-svn-ports-all@FreeBSD.ORG Mon Apr 28 12:54:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D152ED04; Mon, 28 Apr 2014 12:54:20 +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 A41A018C1; Mon, 28 Apr 2014 12:54:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3SCsK2M034925; Mon, 28 Apr 2014 12:54:20 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3SCsKbO034923; Mon, 28 Apr 2014 12:54:20 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404281254.s3SCsKbO034923@svn.freebsd.org> From: Pawel Pekala Date: Mon, 28 Apr 2014 12:54:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352491 - head/graphics/pornview 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: Mon, 28 Apr 2014 12:54:20 -0000 Author: pawel Date: Mon Apr 28 12:54:19 2014 New Revision: 352491 URL: http://svnweb.freebsd.org/changeset/ports/352491 QAT: https://qat.redports.org/buildarchive/r352491/ Log: - Port is stage safe - Fix recursive COMMENT - Convert to new LIB_DEPENDS format - Use options helpers, subs Modified: head/graphics/pornview/Makefile head/graphics/pornview/pkg-plist Modified: head/graphics/pornview/Makefile ============================================================================== --- head/graphics/pornview/Makefile Mon Apr 28 12:46:39 2014 (r352490) +++ head/graphics/pornview/Makefile Mon Apr 28 12:54:19 2014 (r352491) @@ -9,11 +9,11 @@ MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/} MAINTAINER= ports@FreeBSD.org -COMMENT= PornView is an image viewer/manager +COMMENT= Image viewer/manager -LIB_DEPENDS= exif:${PORTSDIR}/graphics/libexif \ - png15:${PORTSDIR}/graphics/png \ - xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ + libpng15.so:${PORTSDIR}/graphics/png \ + libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil USE_XORG= x11 xi xext xinerama USES= pkgconfig @@ -25,22 +25,15 @@ LDFLAGS+= -L${LOCALBASE}/lib -lm OPTIONS_DEFINE= LIBXINE MPLAYER NLS OPTIONS_DEFAULT= LIBXINE +OPTIONS_SUB= yes -NO_STAGE= yes -.include -.if ${PORT_OPTIONS:MLIBXINE} -LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine -CONFIGURE_ARGS+= --enable-xine -.elif ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer -CONFIGURE_ARGS+= --enable-mplayer -.endif -.if ! ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= WITH_NLS="@comment " -.else -PLIST_SUB+= WITH_NLS="" -.endif +LIBXINE_CONFIGURE_ENABLE= xine +LIBXINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine + +MPLAYER_CONFIGURE_ENABLE= mplayer +MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer + +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e \ Modified: head/graphics/pornview/pkg-plist ============================================================================== --- head/graphics/pornview/pkg-plist Mon Apr 28 12:46:39 2014 (r352490) +++ head/graphics/pornview/pkg-plist Mon Apr 28 12:54:19 2014 (r352491) @@ -1,8 +1,8 @@ bin/pornview share/gnome/apps/Graphics/pornview.desktop share/pixmaps/pornview.png -%%WITH_NLS%%share/locale/fr/LC_MESSAGES/pornview.mo -%%WITH_NLS%%share/locale/pl/LC_MESSAGES/pornview.mo +%%NLS%%share/locale/fr/LC_MESSAGES/pornview.mo +%%NLS%%share/locale/pl/LC_MESSAGES/pornview.mo share/pornview/scripts/helloworld @dirrm share/pornview/scripts @dirrm share/pornview