diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index 6f7384feef7c..76df26e1d01f 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -1,65 +1,70 @@ PORTNAME= mupdf DISTVERSION= 1.23.9 DISTVERSIONSUFFIX= -source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/archive/ MAINTAINER= uzsolt@FreeBSD.org COMMENT= Lightweight PDF viewer and toolkit WWW= https://www.mupdf.com/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjbig2dec.so:graphics/jbig2dec \ libopenjp2.so:graphics/openjpeg -USES= cpe compiler:c++11-lang gl gmake jpeg pkgconfig xorg -USE_XORG= x11 xcursor xext xinerama xrandr +USES= compiler:c++11-lang cpe gl gmake jpeg pkgconfig xorg +CPE_VENDOR= artifex USE_GL= gl glut USE_LDCONFIG= yes +USE_XORG= x11 xcursor xext xinerama xrandr -CPE_VENDOR= artifex +MAKE_ARGS= build=release \ + mandir=${PREFIX}/share/man \ + prefix=${PREFIX} \ + SOVERSION=${DISTVERSION} \ + verbose=yes \ + XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \ + XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" +ALL_TARGET= all extra-libs # pkg-config to avoid the conflict with openjpeg15 CFLAGS+= `pkg-config --cflags libopenjp2` LDFLAGS+= `pkg-config --libs libjpeg libopenjp2` -ljbig2dec -MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \ - XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \ - XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \ - SOVERSION=${DISTVERSION} -ALL_TARGET= all extra-libs +BINARY_ALIAS= bash=/bin/sh + +PLIST_SUB= SOVERSION=${PORTVERSION} -OPTIONS_DEFINE= DOCS JS SCROLL +OPTIONS_DEFINE= DOCS JS SCROLL OPTIONS_DEFAULT= SCROLL JS_DESC= JavaScript support (V8 engine) SCROLL_DESC= Build with scroll hacks -JS_LIB_DEPENDS= libv8.so:lang/v8 -JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 +JS_LIB_DEPENDS= libv8.so:lang/v8 +JS_MAKE_ARGS= V8_PRESENT=1 \ + V8LIBS=-lv8 SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c -BINARY_ALIAS= bash=/bin/sh -PLIST_SUB= SOVERSION=${PORTVERSION} - post-patch: @${REINPLACE_CMD} -e 's/-pipe -O2//' -e 's/-ldl//' ${WRKSRC}/Makerules post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 \ ${STAGEDIR}${PREFIX}/bin/mupdf ${INSTALL_PROGRAM} \ ${WRKSRC}/build/release/muraster \ ${STAGEDIR}${PREFIX}/bin ${LN} -s libmupdf.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf.so ${LN} -s libmupdf-third.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf-third.so .include diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist index f22e40634d55..b05a489d69ee 100644 --- a/graphics/mupdf/pkg-plist +++ b/graphics/mupdf/pkg-plist @@ -1,103 +1,103 @@ bin/mupdf bin/mupdf-gl bin/muraster bin/mutool include/mupdf/fitz.h include/mupdf/fitz/archive.h include/mupdf/fitz/band-writer.h include/mupdf/fitz/bidi.h include/mupdf/fitz/bitmap.h include/mupdf/fitz/buffer.h include/mupdf/fitz/color.h include/mupdf/fitz/compress.h include/mupdf/fitz/compressed-buffer.h include/mupdf/fitz/config.h include/mupdf/fitz/context.h include/mupdf/fitz/crypt.h include/mupdf/fitz/device.h include/mupdf/fitz/display-list.h include/mupdf/fitz/document.h include/mupdf/fitz/export.h include/mupdf/fitz/filter.h include/mupdf/fitz/font.h include/mupdf/fitz/geometry.h include/mupdf/fitz/getopt.h include/mupdf/fitz/glyph-cache.h include/mupdf/fitz/glyph.h include/mupdf/fitz/hash.h include/mupdf/fitz/image.h include/mupdf/fitz/link.h include/mupdf/fitz/log.h include/mupdf/fitz/outline.h include/mupdf/fitz/output-svg.h include/mupdf/fitz/output.h include/mupdf/fitz/path.h include/mupdf/fitz/pixmap.h include/mupdf/fitz/pool.h include/mupdf/fitz/separation.h include/mupdf/fitz/shade.h include/mupdf/fitz/store.h include/mupdf/fitz/story-writer.h include/mupdf/fitz/story.h include/mupdf/fitz/stream.h include/mupdf/fitz/string-util.h include/mupdf/fitz/structured-text.h include/mupdf/fitz/system.h include/mupdf/fitz/text.h include/mupdf/fitz/track-usage.h include/mupdf/fitz/transition.h include/mupdf/fitz/tree.h include/mupdf/fitz/types.h include/mupdf/fitz/util.h include/mupdf/fitz/version.h include/mupdf/fitz/write-pixmap.h include/mupdf/fitz/writer.h include/mupdf/fitz/xml.h include/mupdf/memento.h include/mupdf/pdf.h include/mupdf/pdf/annot.h include/mupdf/pdf/clean.h include/mupdf/pdf/cmap.h include/mupdf/pdf/crypt.h include/mupdf/pdf/document.h include/mupdf/pdf/event.h include/mupdf/pdf/font.h include/mupdf/pdf/form.h include/mupdf/pdf/interpret.h include/mupdf/pdf/javascript.h include/mupdf/pdf/name-table.h include/mupdf/pdf/object.h include/mupdf/pdf/page.h include/mupdf/pdf/parse.h include/mupdf/pdf/resource.h include/mupdf/pdf/xref.h include/mupdf/ucdn.h lib/libmupdf-third.so lib/libmupdf-third.so.%%SOVERSION%% lib/libmupdf.so lib/libmupdf.so.%%SOVERSION%% -man/man1/mupdf.1.gz -man/man1/mutool.1.gz +share/man/man1/mupdf.1.gz +share/man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/examples/SnarkFront.svg %%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js %%PORTDOCS%%%%DOCSDIR%%/examples/example.c %%PORTDOCS%%%%DOCSDIR%%/examples/fix-s22pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/huntingofthesnark.png %%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-dejpx.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-extract-rich-media.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-portfolio.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.js %%PORTDOCS%%%%DOCSDIR%%/examples/storytest.c %%PORTDOCS%%%%DOCSDIR%%/examples/storytest.js %%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile index 1bdec5e8677b..ecd0837e80ca 100644 --- a/x11-wm/herbstluftwm/Makefile +++ b/x11-wm/herbstluftwm/Makefile @@ -1,42 +1,43 @@ PORTNAME= herbstluftwm DISTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= https://herbstluftwm.org/tarballs/ MAINTAINER= uzsolt@FreeBSD.org COMMENT= Manual tiling window manager for X11 WWW= https://herbstluftwm.org/ LICENSE= BSD2CLAUSE BUILD_DEPENDS= asciidoc:textproc/asciidoc LIB_DEPENDS+= libfreetype.so:print/freetype2 USES= cmake compiler:c++11-lang gnome \ localbase:ldflags pkgconfig shebangfix xorg USE_GNOME= glib20 USE_XORG= x11 xext xfixes xft xinerama xrandr xrender SHEBANG_FILES= doc/gendoc.py scripts/*.sh share/*.sh SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes DOCS_USES+= python:build DOCS_CMAKE_BOOL+= WITH_DOCUMENTATION DOCS_VARS= binary_alias=python3=${PYTHON_CMD} .include post-patch-EXAMPLES-on: @${REINPLACE_CMD} -e 's,$${DOCDIR}/examples,${EXAMPLESDIR},' ${WRKSRC}/CMakeLists.txt post-patch-EXAMPLES-off: @${REINPLACE_CMD} -e '\@$${DOCDIR}/examples@d' ${WRKSRC}/CMakeLists.txt post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/herbst* .include diff --git a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt index ac1cef86b9cc..df06cfaf8379 100644 --- a/x11-wm/herbstluftwm/files/patch-CMakeLists.txt +++ b/x11-wm/herbstluftwm/files/patch-CMakeLists.txt @@ -1,36 +1,36 @@ ---- CMakeLists.txt.orig 2021-02-17 10:06:29 UTC +--- CMakeLists.txt.orig 2022-07-30 05:55:21 UTC +++ CMakeLists.txt @@ -20,13 +20,13 @@ include(ccache) ## set install variables # prefix for systemwide configuration, accompanies CMAKE_INSTALL_PREFIX -set(CMAKE_INSTALL_SYSCONF_PREFIX "/etc" CACHE PATH +set(CMAKE_INSTALL_SYSCONF_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Top-level install path for configuration files. May be given relative to CMAKE_INSTALL_PREFIX.") set(CONFIGDIR "${CMAKE_INSTALL_SYSCONF_PREFIX}/xdg/herbstluftwm") set(BINDIR bin) set(DATADIR share) -set(MANDIR ${DATADIR}/man) -+set(MANDIR ${CMAKE_INSTALL_PREFIX}/man) ++set(MANDIR ${CMAKE_INSTALL_PREFIX}/share/man) set(DOCDIR ${DATADIR}/doc/herbstluftwm) set(LICENSEDIR ${DOCDIR} CACHE PATH "Install path for license file") -@@ -36,7 +36,7 @@ set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/site-functions +@@ -36,7 +36,7 @@ set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completio CACHE PATH "Install path for zsh completions file") set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completions.d CACHE PATH "Install path for fish completions file") -set(BASHCOMPLETIONDIR ${DATADIR}/bash-completion/completions +set(BASHCOMPLETIONDIR ${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d CACHE PATH "Install path for bash completions file") ## do the actual work -@@ -47,7 +47,6 @@ add_subdirectory(share) +@@ -47,7 +47,6 @@ install(FILES NEWS DESTINATION ${DOCDIR}) ## install everything that was not installed from subdirectories install(FILES NEWS DESTINATION ${DOCDIR}) -install(FILES LICENSE DESTINATION ${LICENSEDIR}) -install(DIRECTORY scripts/ DESTINATION ${DOCDIR}/examples USE_SOURCE_PERMISSIONS) +install(DIRECTORY scripts/ DESTINATION /usr/local/share/examples/herbstluftwm USE_SOURCE_PERMISSIONS) # vim: et:ts=4:sw=4 diff --git a/x11-wm/herbstluftwm/pkg-plist b/x11-wm/herbstluftwm/pkg-plist index 6d6b2aa6efcd..f23de1a17274 100644 --- a/x11-wm/herbstluftwm/pkg-plist +++ b/x11-wm/herbstluftwm/pkg-plist @@ -1,39 +1,39 @@ bin/herbstclient bin/herbstluftwm etc/bash_completion.d/herbstclient etc/xdg/herbstluftwm/autostart etc/xdg/herbstluftwm/dmenu_run_hlwm etc/xdg/herbstluftwm/panel.sh etc/xdg/herbstluftwm/restartpanels.sh share/fish/vendor_completions.d/herbstclient.fish share/xsessions/herbstluftwm.desktop share/zsh/site-functions/_herbstclient %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/hlwm-doc.json %%PORTDOCS%%%%DOCSDIR%%/html/herbstclient.html %%PORTDOCS%%%%DOCSDIR%%/html/herbstluftwm-tutorial.html %%PORTDOCS%%%%DOCSDIR%%/html/herbstluftwm.html -%%PORTDOCS%%man/man1/herbstclient.1.gz -%%PORTDOCS%%man/man1/herbstluftwm.1.gz -%%PORTDOCS%%man/man7/herbstluftwm-tutorial.7.gz +%%PORTDOCS%%share/man/man1/herbstclient.1.gz +%%PORTDOCS%%share/man/man1/herbstluftwm.1.gz +%%PORTDOCS%%share/man/man7/herbstluftwm-tutorial.7.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dmenu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpbeautify.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exec_on_tag.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/execwith.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/float-maximize.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/floatmon.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/herbstcommander.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keychain.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lasttag.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadstate.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/maximize.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/perclient_kb_layout.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/q3terminal.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/savestate.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scratchpad.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/toggledualhead.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unminimize.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/windowmenu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wselect.sh diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile index 26fbf1908d65..93526080f64d 100644 --- a/x11/stalonetray/Makefile +++ b/x11/stalonetray/Makefile @@ -1,28 +1,30 @@ PORTNAME= stalonetray DISTVERSIONPREFIX= v DISTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= uzsolt@FreeBSD.org COMMENT= STAnd-aLONE system tray WWW= https://kolbusa.github.io/stalonetray/ LICENSE= GPLv2 BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ libxslt>0:textproc/libxslt USES= autoreconf gmake xorg USE_GITHUB= yes GH_ACCOUNT= kolbusa USE_XORG= sm ice x11 xpm GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --disable-native-kde \ --disable-debug post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/stalonetrayrc.sample ${STAGEDIR}${EXAMPLESDIR}/ .include diff --git a/x11/stalonetray/pkg-plist b/x11/stalonetray/pkg-plist index 14d596c789b9..1302605a567d 100644 --- a/x11/stalonetray/pkg-plist +++ b/x11/stalonetray/pkg-plist @@ -1,3 +1,3 @@ bin/stalonetray -man/man1/stalonetray.1.gz +share/man/man1/stalonetray.1.gz %%EXAMPLESDIR%%/stalonetrayrc.sample