Attached patch do the following: - update from 2.9.3 to 2.10 - convert to new format of LIB_DEPENDS - moves PORTDOCS to pkg-plist and changes doc install method - add staging support Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->zeising Over to maintainer (via the GNATS Auto Assign Tool)
Thank you for your patch! I will look into this as soon as I can. Regards! -- Niclas
Author: zeising Date: Sun Apr 6 07:25:30 2014 New Revision: 350340 URL: http://svnweb.freebsd.org/changeset/ports/350340 QAT: https://qat.redports.org/buildarchive/r350340/ Log: Update to 2.10 Stagify Convert to new LIB_DEPENDS Change handling of PORTDOCS. Add missing dependencies and strip binary by default. PR: ports/188222 (based on) Submitted by: Mikhail <mp39590@gmail.com> Modified: head/graphics/feh/Makefile head/graphics/feh/distinfo head/graphics/feh/pkg-plist Modified: head/graphics/feh/Makefile ============================================================================== --- head/graphics/feh/Makefile Sun Apr 6 07:04:43 2014 (r350339) +++ head/graphics/feh/Makefile Sun Apr 6 07:25:30 2014 (r350340) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= feh -PORTVERSION= 2.9.3 -PORTREVISION= 2 +PORTVERSION= 2.10 CATEGORIES= graphics MASTER_SITES= http://feh.finalrewind.org/ \ ${MASTER_SITE_LOCAL} @@ -14,33 +13,20 @@ COMMENT= An image viewer that utilizes I LICENSE= MIT -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - giblib.1:${PORTSDIR}/graphics/giblib +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libgiblib.so:${PORTSDIR}/graphics/giblib USE_XORG= x11 xt xinerama -USES= gmake perl5 +USES= gmake perl5 tar:bzip2 shebangfix desktop-file-utils USE_PERL5= run -USE_BZIP2= yes - -MAN1= feh.1 feh-cam.1 gen-cam-menu.1 +SHEBANG_FILES= ${WRKSRC}/cam/feh-cam CPPFLAGS+= -I${LOCALBASE}/include -std=c99 LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= LDFLAGS="${LDFLAGS}" -PORTDOCS= AUTHORS ChangeLog README TODO - -NO_STAGE= yes -.include <bsd.port.options.mk> - -post-patch: - @${REINPLACE_CMD} 's/install-man install-doc/install-man/' \ - ${WRKSRC}/Makefile - post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh + .include <bsd.port.mk> Modified: head/graphics/feh/distinfo ============================================================================== --- head/graphics/feh/distinfo Sun Apr 6 07:04:43 2014 (r350339) +++ head/graphics/feh/distinfo Sun Apr 6 07:25:30 2014 (r350340) @@ -1,2 +1,2 @@ -SHA256 (feh-2.9.3.tar.bz2) = b4e8d603033af12afa77ae8020bcf4ff51c6950b9a6880a0fe32b04fdf7290f2 -SIZE (feh-2.9.3.tar.bz2) = 2082188 +SHA256 (feh-2.10.tar.bz2) = bc782a884eedd7a73284804d8145238f140fa59fed8d483102d1d25e8144ca83 +SIZE (feh-2.10.tar.bz2) = 2082905 Modified: head/graphics/feh/pkg-plist ============================================================================== --- head/graphics/feh/pkg-plist Sun Apr 6 07:04:43 2014 (r350339) +++ head/graphics/feh/pkg-plist Sun Apr 6 07:25:30 2014 (r350340) @@ -2,9 +2,13 @@ bin/feh bin/feh-cam bin/gen-cam-menu share/applications/feh.desktop -%%EXAMPLESDIR%%/buttons -%%EXAMPLESDIR%%/keys -%%EXAMPLESDIR%%/themes +man/man1/feh-cam.1.gz +man/man1/feh.1.gz +man/man1/gen-cam-menu.1.gz +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttons +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/themes %%DATADIR%%/fonts/black.style %%DATADIR%%/fonts/menu.style %%DATADIR%%/fonts/yudit.ttf @@ -16,7 +20,12 @@ share/applications/feh.desktop %%DATADIR%%/images/menubg_brushed.png %%DATADIR%%/images/menubg_default.png %%DATADIR%%/images/menubg_sky.png +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%% @dirrm %%EXAMPLESDIR%% +@dirrm %%DOCSDIR%% _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed with changes. Thanks!