Skip to content

Commit

Permalink
x11-fm/deforaos-browser: update to 0.5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
khorben authored and ocochard committed Nov 23, 2023
1 parent ded334e commit a359da1
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 45 deletions.
19 changes: 7 additions & 12 deletions x11-fm/deforaos-browser/Makefile
@@ -1,31 +1,30 @@
PORTNAME= deforaos-browser
PORTVERSION= 0.5.1
PORTREVISION= 1
PORTVERSION= 0.5.5
CATEGORIES= x11-fm
MASTER_SITES= http://www.defora.org/os/download/download/4442/
MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Browser/
DISTNAME= Browser-${PORTVERSION}

MAINTAINER= olivier@FreeBSD.org
COMMENT= DeforaOS desktop file browser
WWW= https://www.defora.org/

LICENSE= BSD3CLAUSE
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \
libDesktop.so:x11/deforaos-libdesktop \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
libXrandr.so:x11/libXrandr

USES= gnome pkgconfig xorg desktop-file-utils

OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
NLS_USES= gettext
DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl

USES= desktop-file-utils gnome pkgconfig xorg
USE_GNOME= gtk20 cairo
USE_GNOME= gtk30 cairo gdkpixbuf2
USE_XORG= x11
USE_LDCONFIG= yes
MAKE_ARGS+= PREFIX=${PREFIX}
Expand All @@ -35,10 +34,6 @@ CONFLICTS_INSTALL= schilyutils silo # bin/browser bin/copy
post-patch:
${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
${WRKSRC}/data/pkgconfig.sh
${REINPLACE_CMD} 's|-Wl,-pie||g' \
${WRKSRC}/tests/Makefile \
${WRKSRC}/tools/Makefile \
${WRKSRC}/src/Makefile

post-patch-DOCS-off:
${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile
Expand Down
6 changes: 3 additions & 3 deletions x11-fm/deforaos-browser/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1475616938
SHA256 (Browser-0.5.1.tar.gz) = d2560e0ac7f97f12055e758cb82f861d9661dd8757e4790c40c1a904c0cbf41a
SIZE (Browser-0.5.1.tar.gz) = 155403
TIMESTAMP = 1696878459
SHA256 (Browser-0.5.5.tar.gz) = 747ef80b027794a42e77a96686ea1fd20b89024f3d677eff2076a50e5db733d8
SIZE (Browser-0.5.5.tar.gz) = 174164
38 changes: 11 additions & 27 deletions x11-fm/deforaos-browser/files/patch-doc_Makefile
@@ -1,14 +1,15 @@
--- doc/Makefile.orig 2016-10-05 08:10:40 UTC
--- doc/Makefile.orig 2023-11-20 18:15:16 UTC
+++ doc/Makefile
@@ -1,4 +1,4 @@
-TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml
+TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml
@@ -1,5 +1,5 @@ SUBDIRS = gtkdoc
SUBDIRS = gtkdoc
-TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)gtkdoc/Browser.types $(OBJDIR)gtkdoc/html.stamp $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)pinentry-sudo-askpass $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml $(OBJDIR)zenity-sudo-askpass
+TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)gtkdoc/Browser.types $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)pinentry-sudo-askpass $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml $(OBJDIR)zenity-sudo-askpass
OBJDIR =
PREFIX = /usr/local
DESTDIR =
@@ -126,42 +126,24 @@ distclean: clean

install: $(TARGETS)
@@ -202,25 +202,15 @@ install: all
$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
else $(MAKE) install; fi) || exit; done
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.1"
Expand All @@ -19,33 +20,16 @@
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.html"
- ./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.html"
../tools/subst.sh -P "$(DESTDIR)$(PREFIX)/share/doc/Browser" -i -- "$(OBJDIR)pinentry-sudo-askpass"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.html"
../tools/subst.sh -P "$(DESTDIR)$(PREFIX)/share/doc/Browser" -i -- "$(OBJDIR)zenity-sudo-askpass"

uninstall:
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.html"
./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.html"

.PHONY: all clean distclean install uninstall
2 changes: 1 addition & 1 deletion x11-fm/deforaos-browser/pkg-descr
@@ -1 +1 @@
DeforaOS desktop browser
DeforaOS desktop file manager and desktop handler
10 changes: 8 additions & 2 deletions x11-fm/deforaos-browser/pkg-plist
Expand Up @@ -29,6 +29,10 @@ lib/libBrowser.so
lib/libBrowser.so.0
lib/libBrowser.so.0.0
libdata/pkgconfig/Browser.pc
%%PORTDOCS%%share/doc/Browser/COPYING
%%PORTDOCS%%share/doc/Browser/README.md
%%PORTDOCS%%share/doc/Browser/pinentry-sudo-askpass
%%PORTDOCS%%share/doc/Browser/zenity-sudo-askpass
%%PORTDOCS%%man/man1/browser.1.gz
%%PORTDOCS%%man/man1/copy.1.gz
%%PORTDOCS%%man/man1/delete.1.gz
Expand All @@ -38,8 +42,10 @@ libdata/pkgconfig/Browser.pc
%%PORTDOCS%%man/man1/open.1.gz
%%PORTDOCS%%man/man1/properties.1.gz
%%PORTDOCS%%man/man1/view.1.gz
share/applications/deforaos-browser.desktop
share/applications/deforaos-desktop-settings.desktop
share/applications/org.defora.browser.desktop
share/applications/org.defora.browser-folder.desktop
share/applications/org.defora.desktop-settings.desktop
share/applications/org.defora.view.desktop
share/icons/hicolor/16x16/apps/browser-view-details.png
share/icons/hicolor/16x16/apps/browser-view-icons.png
share/icons/hicolor/16x16/apps/browser-view-list.png
Expand Down

0 comments on commit a359da1

Please sign in to comment.