From owner-svn-ports-all@FreeBSD.ORG Thu Apr 24 17:26:58 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 230C741D; Thu, 24 Apr 2014 17:26:58 +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 0F21216BA; Thu, 24 Apr 2014 17:26:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OHQvvV044932; Thu, 24 Apr 2014 17:26:57 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OHQvcj044929; Thu, 24 Apr 2014 17:26:57 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201404241726.s3OHQvcj044929@svn.freebsd.org> From: Tijl Coosemans Date: Thu, 24 Apr 2014 17:26:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352026 - head/ftp/urlgfe 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: Thu, 24 Apr 2014 17:26:58 -0000 Author: tijl Date: Thu Apr 24 17:26:57 2014 New Revision: 352026 URL: http://svnweb.freebsd.org/changeset/ports/352026 QAT: https://qat.redports.org/buildarchive/r352026/ Log: - Convert to USES=libtool. - Fix COMMENT, LIB_DEPENDS. - Always install desktop entry. - Add DOCS and NLS options. - Staging. Modified: head/ftp/urlgfe/Makefile head/ftp/urlgfe/pkg-plist Modified: head/ftp/urlgfe/Makefile ============================================================================== --- head/ftp/urlgfe/Makefile Thu Apr 24 17:24:53 2014 (r352025) +++ head/ftp/urlgfe/Makefile Thu Apr 24 17:26:57 2014 (r352026) @@ -3,50 +3,42 @@ PORTNAME= urlgfe PORTVERSION= 0.7.1 -PORTREVISION?= 15 +PORTREVISION= 16 CATEGORIES= ftp www MASTER_SITES= SF/urlget/Urlgfe%20%28legacy%29/${PORTVERSION} MAINTAINER= chip-set@mail.ru -COMMENT= A download manager +COMMENT= Download manager -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -USE_GNOME= gtk20 lthack -USES= pkgconfig -WANT_GNOME= yes +GNU_CONFIGURE= yes +USES= dos2unix libtool pkgconfig +USE_GNOME= gtk20 USE_OPENSSL= yes -USE_AUTOTOOLS= libtool -USE_DOS2UNIX= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS NLS +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls -.if ${HAVE_GNOME:Mgnomehier}!="" -WITH_GNOME= yes -PLIST_SUB+= GNOME:="" -.else -PLIST_SUB+= GNOME:="@comment " -.endif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f @${REINPLACE_CMD} -e 's|[$$]{prefix}/doc/urlgfe|${DOCSDIR}|g' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|urlgfe_icon|urlgfe-icon|g ; \ - s|/usr/share/pixmaps/urlgfe/||g' ${WRKSRC}/${PORTNAME}.desktop + @${REINPLACE_CMD} \ + 's|/usr/share/pixmaps/urlgfe/urlgfe_icon|${PREFIX}/share/pixmaps/urlgfe-icon|' \ + ${WRKSRC}/${PORTNAME}.desktop @${REINPLACE_CMD} -e 's| -g| ${CFLAGS}|g' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|@MKINSTALLDIRS@|$$(top_srcdir)/@MKINSTALLDIRS@|g ; \ s|[$$][(]top_builddir[)]/[$$][(]MKINSTALLDIRS[)]|$$(top_srcdir)/mkinstalldirs|g' \ ${WRKSRC}/po/Makefile.in.in -.if defined(WITH_GNOME) post-install: - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/gnome/apps/Internet/ - @${INSTALL_DATA} ${WRKSRC}/pixmaps/${PORTNAME}-icon.png ${PREFIX}/share/pixmaps/ -.endif + @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} + @${INSTALL_DATA} ${WRKSRC}/pixmaps/${PORTNAME}-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps -.include +.include Modified: head/ftp/urlgfe/pkg-plist ============================================================================== --- head/ftp/urlgfe/pkg-plist Thu Apr 24 17:24:53 2014 (r352025) +++ head/ftp/urlgfe/pkg-plist Thu Apr 24 17:26:57 2014 (r352026) @@ -1,13 +1,13 @@ bin/urlgfe -%%DOCSDIR%%/ABOUT-NLS -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README -%%DOCSDIR%%/TODO -%%GNOME:%%share/gnome/apps/Internet/urlgfe.desktop -%%GNOME:%%share/pixmaps/urlgfe-icon.png +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +share/applications/urlgfe.desktop share/locale/zh_TW/LC_MESSAGES/urlgfe.mo -@dirrm %%DOCSDIR%% +share/pixmaps/urlgfe-icon.png +%%PORTDOCS%%@dirrm %%DOCSDIR%%