diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index e94f9f13a2ee..1ce2eac9dfc7 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -1,55 +1,56 @@ # Created by: Jeremy Norris PORTNAME= feh PORTVERSION= 3.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://feh.finalrewind.org/ \ LOCAL/uqs MAINTAINER= dmenelkir@gmail.com COMMENT= Image viewer that utilizes Imlib2 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ libpng.so:graphics/png USES= compiler:c++11-lang cpe desktop-file-utils gmake localbase:ldflags \ tar:bzip2 xorg USE_XORG= x11 xt xinerama CPE_VENDOR= feh_project MAKE_ENV+= LDFLAGS="${LDFLAGS}" verscmp=0 OPTIONS_DEFINE= CURL DCRAW DOCS EXAMPLES EXIF XINERAMA EXIF_DESC= Support EXIF tags DCRAW_DESC= Use dcraw to display raw file previews OPTIONS_DEFAULT=CURL EXIF XINERAMA OPTIONS_SUB= yes EXIF_LIB_DEPENDS= libexif.so:graphics/libexif EXIF_MAKE_ENV= exif=1 EXIF_MAKE_ENV_OFF= exif=0 XINERAMA_MAKE_ENV= xinerama=1 XINERAMA_MAKE_ENV_OFF= xinerama=0 CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_MAKE_ENV= curl=1 CURL_MAKE_ENV_OFF= curl=0 DCRAW_RUN_DEPENDS= dcraw:graphics/dcraw post-patch-DOCS-off: @${REINPLACE_CMD} -e 's|install-doc||' \ ${WRKSRC}/Makefile post-patch-EXAMPLES-off: @${REINPLACE_CMD} -e 's|install-examples||' \ ${WRKSRC}/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh .include diff --git a/graphics/feh/files/patch-config.mk b/graphics/feh/files/patch-config.mk index 537cdab4557c..b67a4f9cf1c3 100644 --- a/graphics/feh/files/patch-config.mk +++ b/graphics/feh/files/patch-config.mk @@ -1,17 +1,12 @@ s--- config.mk.orig 2017-12-28 18:28:35 UT2 +--- config.mk.orig 2022-01-03 10:34:57 UTC +++ config.mk -@@ -22,12 +22,12 @@ endif - - # Directories for manuals, executables, docs, data, etc. - main_dir = ${DESTDIR}${PREFIX} --man_dir = ${main_dir}/share/man -+man_dir = ${main_dir}/man - bin_dir = ${main_dir}/bin +@@ -28,7 +28,7 @@ font_dir = ${main_dir}/share/feh/fonts doc_dir = ${main_dir}/share/doc/feh image_dir = ${main_dir}/share/feh/images font_dir = ${main_dir}/share/feh/fonts -example_dir = ${main_dir}/share/doc/feh/examples +example_dir = ${main_dir}/share/examples/feh desktop_dir = ${main_dir}/share/applications icon_dir = ${ICON_PREFIX}/hicolor 48_icon_dir = ${icon_dir}/48x48/apps diff --git a/graphics/feh/pkg-plist b/graphics/feh/pkg-plist index 57e4855473ff..626046b8c2a6 100644 --- a/graphics/feh/pkg-plist +++ b/graphics/feh/pkg-plist @@ -1,19 +1,19 @@ bin/feh -man/man1/feh.1.gz +share/man/man1/feh.1.gz share/applications/feh.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttons %%PORTEXAMPLES%%%%EXAMPLESDIR%%/find-lowres %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys %%PORTEXAMPLES%%%%EXAMPLESDIR%%/themes %%DATADIR%%/fonts/black.style %%DATADIR%%/fonts/menu.style %%DATADIR%%/fonts/yudit.ttf %%DATADIR%%/images/feh.png %%DATADIR%%/images/feh.svg %%DATADIR%%/images/menubg_default.png share/icons/hicolor/48x48/apps/feh.png share/icons/hicolor/scalable/apps/feh.svg