pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove DeforaOS packages with Gtk+ 3 support upstream
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Sat Jan 11 02:33:03 2020 +0100
Changeset: d126eab9a949a2a82afdda5cce901083a63f0c08
Modified Files:
Makefile
deforaos-desktop/Makefile
Removed Files:
deforaos-browser/DESCR
deforaos-browser/Makefile
deforaos-browser/PLIST
deforaos-browser/buildlink3.mk
deforaos-browser/distinfo
deforaos-browser/options.mk
deforaos-browser/patches/patch-data_Makefile
deforaos-browser/patches/patch-data_project.conf
deforaos-browser/patches/patch-doc_Makefile
deforaos-browser/patches/patch-doc_project.conf
deforaos-browser/patches/patch-src_Makefile
deforaos-browser/patches/patch-src_project.conf
deforaos-browser/patches/patch-src_view.c
deforaos-browser/patches/patch-tools_Makefile
deforaos-browser/patches/patch-tools_project.conf
deforaos-libdesktop/DESCR
deforaos-libdesktop/Makefile
deforaos-libdesktop/PLIST
deforaos-libdesktop/buildlink3.mk
deforaos-libdesktop/distinfo
deforaos-libdesktop/patches/patch-data_libDesktop.pc.in
deforaos-libdesktop/patches/patch-src_Makefile
deforaos-libdesktop/patches/patch-tests_Makefile
deforaos-libdesktop/patches/patch-tools_Makefile
deforaos-locker/DESCR
deforaos-locker/Makefile
deforaos-locker/PLIST
deforaos-locker/buildlink3.mk
deforaos-locker/distinfo
deforaos-locker/options.mk
deforaos-locker/patches/patch-src_auth_Makefile
deforaos-locker/patches/patch-src_demos_Makefile
deforaos-locker/patches/patch-src_plugins_Makefile
deforaos-locker/patches/patch-tools_Makefile
deforaos-panel/DESCR
deforaos-panel/Makefile
deforaos-panel/PLIST
deforaos-panel/buildlink3.mk
deforaos-panel/distinfo
deforaos-panel/options.mk
deforaos-panel/patches/patch-data_Panel.pc.in
deforaos-panel/patches/patch-data_pkgconfig.sh
deforaos-panel/patches/patch-src_Makefile
deforaos-panel/patches/patch-src_applets_Makefile
deforaos-panel/patches/patch-src_applets_embed.c
deforaos-panel/patches/patch-src_applets_main.c
deforaos-panel/patches/patch-src_applets_memory.c
deforaos-panel/patches/patch-src_applets_swap.c
deforaos-panel/patches/patch-src_applets_volume.c
deforaos-panel/patches/patch-src_panel.c
deforaos-panel/patches/patch-tools_Makefile
deforaos-panel/patches/patch-tools_message.c
deforaos-phone/DESCR
deforaos-phone/Makefile
deforaos-phone/PLIST
deforaos-phone/distinfo
deforaos-phone/patches/patch-src_modems_Makefile
deforaos-phone/patches/patch-src_plugins_Makefile
deforaos-phone/patches/patch-tools_Makefile
deforaos-surfer/DESCR
deforaos-surfer/Makefile
deforaos-surfer/PLIST
deforaos-surfer/distinfo
deforaos-surfer/options.mk
deforaos-surfer/patches/patch-src_Makefile
deforaos-surfer/patches/patch-src_download.c
deforaos-surfer/patches/patch-tools_Makefile
Log Message:
Remove DeforaOS packages with Gtk+ 3 support upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d126eab9a949a2a82afdda5cce901083a63f0c08
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 6 --
deforaos-browser/DESCR | 3 -
deforaos-browser/Makefile | 46 ----------
deforaos-browser/PLIST | 43 ----------
deforaos-browser/buildlink3.mk | 14 ----
deforaos-browser/distinfo | 14 ----
deforaos-browser/options.mk | 11 ---
deforaos-browser/patches/patch-data_Makefile | 20 -----
deforaos-browser/patches/patch-data_project.conf | 12 ---
deforaos-browser/patches/patch-doc_Makefile | 62 --------------
deforaos-browser/patches/patch-doc_project.conf | 12 ---
deforaos-browser/patches/patch-src_Makefile | 84 -------------------
deforaos-browser/patches/patch-src_project.conf | 13 ---
deforaos-browser/patches/patch-src_view.c | 18 ----
deforaos-browser/patches/patch-tools_Makefile | 18 ----
deforaos-browser/patches/patch-tools_project.conf | 16 ----
deforaos-desktop/Makefile | 5 --
deforaos-libdesktop/DESCR | 3 -
deforaos-libdesktop/Makefile | 23 -----
deforaos-libdesktop/PLIST | 38 ---------
deforaos-libdesktop/buildlink3.mk | 16 ----
deforaos-libdesktop/distinfo | 9 --
.../patches/patch-data_libDesktop.pc.in | 14 ----
deforaos-libdesktop/patches/patch-src_Makefile | 18 ----
deforaos-libdesktop/patches/patch-tests_Makefile | 18 ----
deforaos-libdesktop/patches/patch-tools_Makefile | 18 ----
deforaos-locker/DESCR | 3 -
deforaos-locker/Makefile | 39 ---------
deforaos-locker/PLIST | 23 -----
deforaos-locker/buildlink3.mk | 14 ----
deforaos-locker/distinfo | 9 --
deforaos-locker/options.mk | 10 ---
deforaos-locker/patches/patch-src_auth_Makefile | 18 ----
deforaos-locker/patches/patch-src_demos_Makefile | 34 --------
deforaos-locker/patches/patch-src_plugins_Makefile | 18 ----
deforaos-locker/patches/patch-tools_Makefile | 18 ----
deforaos-panel/DESCR | 3 -
deforaos-panel/Makefile | 53 ------------
deforaos-panel/PLIST | 77 -----------------
deforaos-panel/buildlink3.mk | 16 ----
deforaos-panel/distinfo | 15 ----
deforaos-panel/options.mk | 11 ---
deforaos-panel/patches/patch-data_Panel.pc.in | 13 ---
deforaos-panel/patches/patch-data_pkgconfig.sh | 20 -----
deforaos-panel/patches/patch-src_Makefile | 17 ----
deforaos-panel/patches/patch-src_applets_Makefile | 30 -------
deforaos-panel/patches/patch-src_applets_embed.c | 28 -------
deforaos-panel/patches/patch-src_applets_main.c | 16 ----
deforaos-panel/patches/patch-src_applets_memory.c | 22 -----
deforaos-panel/patches/patch-src_applets_swap.c | 12 ---
deforaos-panel/patches/patch-src_applets_volume.c | 15 ----
deforaos-panel/patches/patch-src_panel.c | 43 ----------
deforaos-panel/patches/patch-tools_Makefile | 12 ---
deforaos-panel/patches/patch-tools_message.c | 16 ----
deforaos-phone/DESCR | 3 -
deforaos-phone/Makefile | 47 -----------
deforaos-phone/PLIST | 97 ----------------------
deforaos-phone/distinfo | 8 --
deforaos-phone/patches/patch-src_modems_Makefile | 17 ----
deforaos-phone/patches/patch-src_plugins_Makefile | 35 --------
deforaos-phone/patches/patch-tools_Makefile | 28 -------
deforaos-surfer/DESCR | 3 -
deforaos-surfer/Makefile | 42 ----------
deforaos-surfer/PLIST | 18 ----
deforaos-surfer/distinfo | 8 --
deforaos-surfer/options.mk | 10 ---
deforaos-surfer/patches/patch-src_Makefile | 27 ------
deforaos-surfer/patches/patch-src_download.c | 14 ----
deforaos-surfer/patches/patch-tools_Makefile | 17 ----
69 files changed, 1533 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index a1b58e4347..961771e469 100644
--- a/Makefile
+++ b/Makefile
@@ -571,23 +571,17 @@ SUBDIR+= decode-dimms
SUBDIR+= dee
SUBDIR+= deepstate
SUBDIR+= deforaos-accessories
-SUBDIR+= deforaos-browser
SUBDIR+= deforaos-camera
SUBDIR+= deforaos-desktop
SUBDIR+= deforaos-editor
SUBDIR+= deforaos-framer
SUBDIR+= deforaos-init
SUBDIR+= deforaos-keyboard
-SUBDIR+= deforaos-libdesktop
-SUBDIR+= deforaos-locker
SUBDIR+= deforaos-mailer
SUBDIR+= deforaos-mixer
-SUBDIR+= deforaos-panel
SUBDIR+= deforaos-pdfviewer
-SUBDIR+= deforaos-phone
SUBDIR+= deforaos-player
SUBDIR+= deforaos-probe
-SUBDIR+= deforaos-surfer
SUBDIR+= deforaos-terminal
SUBDIR+= deforaos-todo
SUBDIR+= deluge
diff --git a/deforaos-browser/DESCR b/deforaos-browser/DESCR
deleted file mode 100644
index f5765cfa41..0000000000
--- a/deforaos-browser/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS desktop file manager and desktop handler
-
-This is the GTK3 version.
diff --git a/deforaos-browser/Makefile b/deforaos-browser/Makefile
deleted file mode 100644
index b862ff3326..0000000000
--- a/deforaos-browser/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2013/12/25 19:55:07 khorben Exp $
-#
-
-DISTNAME= Browser-0.4.13
-PKGNAME= deforaos-browser-0.4.13
-CATEGORIES= sysutils
-MASTER_SITES= https://www.defora.org/os/download/download/4310/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop file manager and desktop handler
-
-LICENSE= gnu-gpl-v3
-
-USE_TOOLS+= pkg-config
-USE_TOOLS+= xgettext
-
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-AUTO_MKDIRS= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${PKGMANDIR} != "share/man"
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/browser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/browser.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/copy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/copy.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/delete.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/delete.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/move.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/move.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/open.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/open.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/properties.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/properties.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/view.1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man
-.endif
-
-.include "options.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../wip/deforaos-libdesktop/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../databases/shared-mime-info/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-browser/PLIST b/deforaos-browser/PLIST
deleted file mode 100644
index 1a9a37f0d6..0000000000
--- a/deforaos-browser/PLIST
+++ /dev/null
@@ -1,43 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2013/12/25 19:55:07 khorben Exp $
-bin/browser
-bin/copy
-bin/delete
-bin/move
-bin/open
-bin/properties
-bin/view
-include/Desktop/Browser.h
-include/Desktop/Browser/desktop.h
-include/Desktop/Browser/plugin.h
-lib/Browser/plugins/cvs.so
-lib/Browser/plugins/dirtree.so
-lib/Browser/plugins/favorites.so
-lib/Browser/plugins/git.so
-lib/Browser/plugins/make.so
-lib/Browser/plugins/preview.so
-lib/Browser/plugins/properties.so
-lib/Browser/plugins/subversion.so
-lib/Browser/plugins/volumes.so
-lib/pkgconfig/Browser.pc
-man/man1/browser.1
-man/man1/copy.1
-man/man1/delete.1
-man/man1/move.1
-man/man1/open.1
-man/man1/properties.1
-man/man1/view.1
-share/applications/browser.desktop
-share/doc/html/Browser/browser.html
-share/doc/html/Browser/copy.html
-share/doc/html/Browser/delete.html
-share/doc/html/Browser/move.html
-share/doc/html/Browser/open.html
-share/doc/html/Browser/properties.html
-share/doc/html/Browser/view.html
-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
-share/locale/de/LC_MESSAGES/Browser.mo
-share/locale/es/LC_MESSAGES/Browser.mo
-share/locale/fr/LC_MESSAGES/Browser.mo
-share/locale/it/LC_MESSAGES/Browser.mo
diff --git a/deforaos-browser/buildlink3.mk b/deforaos-browser/buildlink3.mk
deleted file mode 100644
index 34a81e4c0d..0000000000
--- a/deforaos-browser/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/12/25 19:55:07 khorben Exp $
-
-BUILDLINK_TREE+= deforaos-browser
-
-.if !defined(DEFORAOS_BROWSER_BUILDLINK3_MK)
-DEFORAOS_BROWSER_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.deforaos-browser+= deforaos-browser>=0.4.5
-BUILDLINK_PKGSRCDIR.deforaos-browser?= ../../wip/deforaos-browser
-
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # DEFORAOS_BROWSER_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -deforaos-browser
diff --git a/deforaos-browser/distinfo b/deforaos-browser/distinfo
deleted file mode 100644
index c55ec6ee6a..0000000000
--- a/deforaos-browser/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.20 2014/06/26 11:22:14 khorben Exp $
-
-SHA1 (Browser-0.4.13.tar.gz) = 2a7eec2032bc224864000a149ba0afc2b8562cbd
-RMD160 (Browser-0.4.13.tar.gz) = 0cee3c24a8bc40a513aab6bd794bbd9865ac73f7
-Size (Browser-0.4.13.tar.gz) = 129587 bytes
-SHA1 (patch-data_Makefile) = a9597776f583198bb47b1007598e6a9cf7502be5
-SHA1 (patch-data_project.conf) = ac1415c849c6dce889416e37a20aafd3b92f079b
-SHA1 (patch-doc_Makefile) = a81087e298d494f49b73018eaebec7bfd7b4ec5d
-SHA1 (patch-doc_project.conf) = ce9546b5a5bbe361debb40175a9e4f66aeb3a3b9
-SHA1 (patch-src_Makefile) = a3f6e88af9b956a189d6878261ab4cfe708a333c
-SHA1 (patch-src_project.conf) = 95d29edbd84d9cde18306697eb30fc6d1a2908a0
-SHA1 (patch-src_view.c) = 936d004da0f44b5a32bf2b66870686377e5af83d
-SHA1 (patch-tools_Makefile) = cad3a088164bc4b724c5916c6fcc6ea628a2354d
-SHA1 (patch-tools_project.conf) = b51e241b8463235194f90528b328cd1347a59818
diff --git a/deforaos-browser/options.mk b/deforaos-browser/options.mk
deleted file mode 100644
index 30865fda26..0000000000
--- a/deforaos-browser/options.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2012/12/24 03:33:27 khorben Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.deforaos-browser
-PKG_SUPPORTED_OPTIONS= embedded
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+= CPPFLAGS=-DEMBEDDED
-.endif
diff --git a/deforaos-browser/patches/patch-data_Makefile b/deforaos-browser/patches/patch-data_Makefile
deleted file mode 100644
index 6b42981595..0000000000
--- a/deforaos-browser/patches/patch-data_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-data_Makefile,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- data/Makefile.orig 2013-10-06 13:34:26.000000000 +0000
-+++ data/Makefile
-@@ -35,13 +35,10 @@ install: $(TARGETS)
- ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Browser.pc"
- $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
- $(INSTALL) -m 0644 browser.desktop $(DESTDIR)$(PREFIX)/share/applications/browser.desktop
-- $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
-- $(INSTALL) -m 0644 desktop-settings.desktop $(DESTDIR)$(PREFIX)/share/applications/desktop-settings.desktop
-
- uninstall:
- @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
- ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -u -- "Browser.pc"
- $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/browser.desktop
-- $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/desktop-settings.desktop
-
- .PHONY: all subdirs clean distclean install uninstall
diff --git a/deforaos-browser/patches/patch-data_project.conf b/deforaos-browser/patches/patch-data_project.conf
deleted file mode 100644
index f2a75e1e53..0000000000
--- a/deforaos-browser/patches/patch-data_project.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-data_project.conf,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- data/project.conf.orig 2013-01-02 03:37:28.000000000 +0000
-+++ data/project.conf
-@@ -12,4 +12,4 @@ install=
- install=$(PREFIX)/share/applications
-
- [desktop-settings.desktop]
--install=$(PREFIX)/share/applications
-+#install=$(PREFIX)/share/applications
diff --git a/deforaos-browser/patches/patch-doc_Makefile b/deforaos-browser/patches/patch-doc_Makefile
deleted file mode 100644
index 6157b547d3..0000000000
--- a/deforaos-browser/patches/patch-doc_Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-doc_Makefile,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- doc/Makefile.orig 2013-10-06 13:34:26.000000000 +0000
-+++ doc/Makefile
-@@ -1,4 +1,4 @@
--TARGETS = browser.1 browser.html copy.1 copy.html delete.1 delete.html desktop.1 desktop.html desktopctl.1 desktopctl.html move.1 move.html open.1 open.html properties.1 properties.html view.1 view.html
-+TARGETS = browser.1 browser.html copy.1 copy.html delete.1 delete.html move.1 move.html open.1 open.html properties.1 properties.html view.1 view.html
- PREFIX = /usr/local
- DESTDIR =
- RM = rm -f
-@@ -27,18 +27,6 @@ delete.1: delete.xml
- delete.html: delete.xml
- ./docbook.sh -P "$(PREFIX)" -- "delete.html"
-
--desktop.1: desktop.xml
-- ./docbook.sh -P "$(PREFIX)" -- "desktop.1"
--
--desktop.html: desktop.xml
-- ./docbook.sh -P "$(PREFIX)" -- "desktop.html"
--
--desktopctl.1: desktopctl.xml
-- ./docbook.sh -P "$(PREFIX)" -- "desktopctl.1"
--
--desktopctl.html: desktopctl.xml
-- ./docbook.sh -P "$(PREFIX)" -- "desktopctl.html"
--
- move.1: move.xml
- ./docbook.sh -P "$(PREFIX)" -- "move.1"
-
-@@ -64,7 +52,7 @@ view.html: view.xml
- ./docbook.sh -P "$(PREFIX)" -- "view.html"
-
- clean:
-- $(RM) -- $(browser.1_OBJS) $(browser.html_OBJS) $(copy.1_OBJS) $(copy.html_OBJS) $(delete.1_OBJS) $(delete.html_OBJS) $(desktop.1_OBJS) $(desktop.html_OBJS) $(desktopctl.1_OBJS) $(desktopctl.html_OBJS) $(move.1_OBJS) $(move.html_OBJS) $(open.1_OBJS) $(open.html_OBJS) $(properties.1_OBJS) $(properties.html_OBJS) $(view.1_OBJS) $(view.html_OBJS)
-+ $(RM) -- $(browser.1_OBJS) $(browser.html_OBJS) $(copy.1_OBJS) $(copy.html_OBJS) $(delete.1_OBJS) $(delete.html_OBJS) $(move.1_OBJS) $(move.html_OBJS) $(open.1_OBJS) $(open.html_OBJS) $(properties.1_OBJS) $(properties.html_OBJS) $(view.1_OBJS) $(view.html_OBJS)
- ./docbook.sh -c -P "$(PREFIX)" -- "view.html"
-
- distclean: clean
-@@ -77,10 +65,6 @@ install: $(TARGETS)
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "copy.html"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "delete.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "delete.html"
-- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktop.1"
-- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktop.html"
-- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktopctl.1"
-- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktopctl.html"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "move.1"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "move.html"
- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "open.1"
-@@ -97,10 +81,6 @@ uninstall:
- ./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"
diff --git a/deforaos-browser/patches/patch-doc_project.conf b/deforaos-browser/patches/patch-doc_project.conf
deleted file mode 100644
index f856403b6d..0000000000
--- a/deforaos-browser/patches/patch-doc_project.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-doc_project.conf,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- doc/project.conf.orig 2013-01-02 03:37:28.000000000 +0000
-+++ doc/project.conf
-@@ -1,4 +1,4 @@
--targets=browser.1,browser.html,copy.1,copy.html,delete.1,delete.html,desktop.1,desktop.html,desktopctl.1,desktopctl.html,move.1,move.html,open.1,open.html,properties.1,properties.html,view.1,view.html
-+targets=browser.1,browser.html,copy.1,copy.html,delete.1,delete.html,move.1,move.html,open.1,open.html,properties.1,properties.html,view.1,view.html
- dist=Makefile,docbook.sh,browser.xml,copy.xml,delete.xml,desktop.xml,desktopctl.xml,mime.conf,move.xml,open.xml,properties.xml,view.xml
-
- [browser.1]
diff --git a/deforaos-browser/patches/patch-src_Makefile b/deforaos-browser/patches/patch-src_Makefile
deleted file mode 100644
index 3a8e66d911..0000000000
--- a/deforaos-browser/patches/patch-src_Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- src/Makefile.orig 2013-10-06 13:34:26.000000000 +0000
-+++ src/Makefile
-@@ -1,5 +1,5 @@
- SUBDIRS = plugins
--TARGETS = browser copy delete desktop desktopctl move open properties vfs.o view
-+TARGETS = browser copy delete move open properties vfs.o view
- PREFIX = /usr/local
- DESTDIR =
- BINDIR = $(PREFIX)/bin
-@@ -42,20 +42,6 @@ delete_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
- delete: $(delete_OBJS)
- $(CC) -o delete $(delete_OBJS) $(delete_LDFLAGS)
-
--desktop_OBJS = desktop.o desktopicon.o
--desktop_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags x11 xrandr`
--desktop_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11 xrandr` vfs.o
--
--desktop: $(desktop_OBJS) vfs.o
-- $(CC) -o desktop $(desktop_OBJS) $(desktop_LDFLAGS)
--
--desktopctl_OBJS = desktopctl.o
--desktopctl_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
--desktopctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
--
--desktopctl: $(desktopctl_OBJS)
-- $(CC) -o desktopctl $(desktopctl_OBJS) $(desktopctl_LDFLAGS)
--
- move_OBJS = move.o
- move_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
- move_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
-@@ -102,15 +88,6 @@ copy.o: copy.c
- delete.o: delete.c
- $(CC) $(delete_CFLAGS) -c delete.c
-
--desktop.o: desktop.c desktopicon.h desktop.h common.c ../config.h
-- $(CC) -D PREFIX=\"$(PREFIX)\" $(desktop_CFLAGS) -c desktop.c
--
--desktopicon.o: desktopicon.c desktop.h desktopicon.h ../config.h
-- $(CC) -D PREFIX=\"$(PREFIX)\" $(desktop_CFLAGS) -c desktopicon.c
--
--desktopctl.o: desktopctl.c desktop.h ../config.h
-- $(CC) $(desktopctl_CFLAGS) -c desktopctl.c
--
- move.o: move.c
- $(CC) $(move_CFLAGS) -c move.c
-
-@@ -128,11 +105,11 @@ view.o: view.c
-
- clean:
- @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
-- $(RM) -- $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(desktop_OBJS) $(desktopctl_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(vfs.o_OBJS) $(view_OBJS)
-+ $(RM) -- $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(vfs.o_OBJS) $(view_OBJS)
-
- distclean:
- @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
-- $(RM) -- $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(desktop_OBJS) $(desktopctl_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(vfs.o_OBJS) $(view_OBJS)
-+ $(RM) -- $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(vfs.o_OBJS) $(view_OBJS)
- $(RM) -- $(TARGETS)
-
- install: $(TARGETS)
-@@ -144,10 +121,6 @@ install: $(TARGETS)
- $(MKDIR) $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 0755 delete $(DESTDIR)$(BINDIR)/delete
- $(MKDIR) $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 0755 desktop $(DESTDIR)$(BINDIR)/desktop
-- $(MKDIR) $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 0755 desktopctl $(DESTDIR)$(BINDIR)/desktopctl
-- $(MKDIR) $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 0755 move $(DESTDIR)$(BINDIR)/move
- $(MKDIR) $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 0755 open $(DESTDIR)$(BINDIR)/open
-@@ -161,8 +134,6 @@ uninstall:
- $(RM) -- $(DESTDIR)$(BINDIR)/browser
- $(RM) -- $(DESTDIR)$(BINDIR)/copy
- $(RM) -- $(DESTDIR)$(BINDIR)/delete
-- $(RM) -- $(DESTDIR)$(BINDIR)/desktop
-- $(RM) -- $(DESTDIR)$(BINDIR)/desktopctl
- $(RM) -- $(DESTDIR)$(BINDIR)/move
- $(RM) -- $(DESTDIR)$(BINDIR)/open
- $(RM) -- $(DESTDIR)$(BINDIR)/properties
diff --git a/deforaos-browser/patches/patch-src_project.conf b/deforaos-browser/patches/patch-src_project.conf
deleted file mode 100644
index 546eb9b938..0000000000
--- a/deforaos-browser/patches/patch-src_project.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_project.conf,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- src/project.conf.orig 2013-10-05 00:05:55.000000000 +0000
-+++ src/project.conf
-@@ -1,5 +1,5 @@
- subdirs=plugins
--targets=browser,copy,delete,desktop,desktopctl,move,open,properties,vfs.o,view
-+targets=browser,copy,delete,move,open,properties,vfs.o,view
- #cppflags=-D EMBEDDED
- cflags_force=-W `pkg-config --cflags libDesktop`
- cflags=-Wall -g -O2 -pedantic
diff --git a/deforaos-browser/patches/patch-src_view.c b/deforaos-browser/patches/patch-src_view.c
deleted file mode 100644
index 195617e964..0000000000
--- a/deforaos-browser/patches/patch-src_view.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_view.c,v 1.1 2014/06/26 11:22:14 khorben Exp $
-
-Fix build with Gtk+ >= 3.0
-
---- src/view.c.orig 2013-10-05 02:01:48.000000000 +0000
-+++ src/view.c
-@@ -155,9 +155,9 @@ static DesktopAccel _view_accel[] =
- static DesktopToolbar _view_toolbar[] =
- {
- { N_("Open with..."), G_CALLBACK(_on_open_with), GTK_STOCK_OPEN,
-- GDK_CONTROL_MASK, GDK_O, NULL },
-+ GDK_CONTROL_MASK, GDK_KEY_O, NULL },
- { N_("Edit"), G_CALLBACK(_on_edit), GTK_STOCK_EDIT, GDK_CONTROL_MASK,
-- GDK_E, NULL },
-+ GDK_KEY_E, NULL },
- { NULL, NULL, NULL, 0, 0, NULL }
- };
- #endif /* EMBEDDED */
diff --git a/deforaos-browser/patches/patch-tools_Makefile b/deforaos-browser/patches/patch-tools_Makefile
deleted file mode 100644
index 67cde649e8..0000000000
--- a/deforaos-browser/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- tools/Makefile.orig 2013-10-06 13:34:26.000000000 +0000
-+++ tools/Makefile
-@@ -6,9 +6,9 @@ SBINDIR = $(PREFIX)/sbin
- CC = cc
- CPPFLAGSF=
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags gtk+-3.0`
- CFLAGS = -Wall -g -O2
--LDFLAGSF= `pkg-config --libs gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs gtk+-3.0`
- RM = rm -f
- LN = ln -f
- MKDIR = mkdir -m 0755 -p
diff --git a/deforaos-browser/patches/patch-tools_project.conf b/deforaos-browser/patches/patch-tools_project.conf
deleted file mode 100644
index 75eedf3e81..0000000000
--- a/deforaos-browser/patches/patch-tools_project.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-tools_project.conf,v 1.1 2013/12/25 19:55:08 khorben Exp $
-
-desktop(1) and desktopctl(1) are not built (Gtk+ 3.0 compatibility issue)
-
---- tools/project.conf.orig 2013-01-02 03:37:28.000000000 +0000
-+++ tools/project.conf
-@@ -1,7 +1,7 @@
- targets=dirtree,iconlist
--cflags_force=-W `pkg-config --cflags gtk+-2.0`
-+cflags_force=-W `pkg-config --cflags gtk+-3.0`
- cflags=-Wall -g -O2
--ldflags_force=`pkg-config --libs gtk+-2.0`
-+ldflags_force=`pkg-config --libs gtk+-3.0`
- dist=Makefile
-
- [dirtree]
diff --git a/deforaos-desktop/Makefile b/deforaos-desktop/Makefile
index b2d6131078..7b24489183 100644
--- a/deforaos-desktop/Makefile
+++ b/deforaos-desktop/Makefile
@@ -14,19 +14,14 @@ LICENSE= gnu-gpl-v3
META_PACKAGE= yes
DEPENDS+= deforaos-accessories>=0.0.3:../../wip/deforaos-accessories
-DEPENDS+= deforaos-browser>=0.4.10:../../wip/deforaos-browser
DEPENDS+= deforaos-camera>=0.0.1:../../wip/deforaos-camera
DEPENDS+= deforaos-editor>=0.2.1:../../wip/deforaos-editor
DEPENDS+= deforaos-framer>=0.0.0:../../wip/deforaos-framer
DEPENDS+= deforaos-keyboard>=0.2.1:../../wip/deforaos-keyboard
-DEPENDS+= deforaos-locker>=0.2.1:../../wip/deforaos-locker
DEPENDS+= deforaos-mailer>=0.1.5:../../wip/deforaos-mailer
DEPENDS+= deforaos-mixer>=0.1.1:../../wip/deforaos-mixer
-DEPENDS+= deforaos-panel>=0.2.16:../../wip/deforaos-panel
DEPENDS+= deforaos-pdfviewer>=0.0.1:../../wip/deforaos-pdfviewer
-DEPENDS+= deforaos-phone>=0.3.11:../../wip/deforaos-phone
DEPENDS+= deforaos-player>=0.1.5:../../wip/deforaos-player
-DEPENDS+= deforaos-surfer>=0.2.6:../../wip/deforaos-surfer
DEPENDS+= deforaos-terminal>=0.0.0:../../wip/deforaos-terminal
DEPENDS+= deforaos-todo>=0.1.2:../../wip/deforaos-todo
diff --git a/deforaos-libdesktop/DESCR b/deforaos-libdesktop/DESCR
deleted file mode 100644
index 6238d99108..0000000000
--- a/deforaos-libdesktop/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS desktop library
-
-This is the GTK3 version.
diff --git a/deforaos-libdesktop/Makefile b/deforaos-libdesktop/Makefile
deleted file mode 100644
index 9afa0b00a0..0000000000
--- a/deforaos-libdesktop/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2015/06/13 20:54:42 khorben Exp $
-#
-
-DISTNAME= libDesktop-0.2.0
-PKGNAME= deforaos-libdesktop-0.2.0
-CATEGORIES= x11
-MASTER_SITES= https://www.defora.org/os/download/download/4355/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop library
-LICENSE= 2-clause-bsd
-
-USE_TOOLS+= pkg-config
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-
-.include "../../devel/deforaos-libsystem/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.20
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-libdesktop/PLIST b/deforaos-libdesktop/PLIST
deleted file mode 100644
index 5f08c1d018..0000000000
--- a/deforaos-libdesktop/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2015/06/13 20:54:42 khorben Exp $
-include/Desktop.h
-include/Desktop/about.h
-include/Desktop/accel.h
-include/Desktop/compat.h
-include/Desktop/help.h
-include/Desktop/menubar.h
-include/Desktop/message.h
-include/Desktop/mime.h
-include/Desktop/toolbar.h
-include/Desktop/widget.h
-lib/libDesktop.a
-lib/libDesktop.so
-lib/libDesktop.so.0
-lib/libDesktop.so.0.0
-lib/pkgconfig/libDesktop.pc
-share/gtk-doc/html/libDesktop/api-index-full.html
-share/gtk-doc/html/libDesktop/ch01.html
-share/gtk-doc/html/libDesktop/deprecated-api-index.html
-share/gtk-doc/html/libDesktop/home.png
-share/gtk-doc/html/libDesktop/index.html
-share/gtk-doc/html/libDesktop/index.sgml
-share/gtk-doc/html/libDesktop/left-insensitive.png
-share/gtk-doc/html/libDesktop/left.png
-share/gtk-doc/html/libDesktop/libDesktop-about.html
-share/gtk-doc/html/libDesktop/libDesktop-accel.html
-share/gtk-doc/html/libDesktop/libDesktop-compat.html
-share/gtk-doc/html/libDesktop/libDesktop-help.html
-share/gtk-doc/html/libDesktop/libDesktop-menubar.html
-share/gtk-doc/html/libDesktop/libDesktop-message.html
-share/gtk-doc/html/libDesktop/libDesktop-mime.html
-share/gtk-doc/html/libDesktop/libDesktop-toolbar.html
-share/gtk-doc/html/libDesktop/libDesktop.devhelp2
-share/gtk-doc/html/libDesktop/right-insensitive.png
-share/gtk-doc/html/libDesktop/right.png
-share/gtk-doc/html/libDesktop/style.css
-share/gtk-doc/html/libDesktop/up-insensitive.png
-share/gtk-doc/html/libDesktop/up.png
diff --git a/deforaos-libdesktop/buildlink3.mk b/deforaos-libdesktop/buildlink3.mk
deleted file mode 100644
index bca84affc9..0000000000
--- a/deforaos-libdesktop/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2015/06/13 21:01:39 khorben Exp $
-#
-
-BUILDLINK_TREE+= deforaos-libdesktop
-
-.if !defined(DEFORAOS_LIBDESKTOP_BUILDLINK3_MK)
-DEFORAOS_LIBDESKTOP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.deforaos-libdesktop+= deforaos-libdesktop>=0.2.0
-BUILDLINK_PKGSRCDIR.deforaos-libdesktop?= ../../wip/deforaos-libdesktop
-
-.include "../../devel/deforaos-libsystem/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # DEFORAOS_LIBDESKTOP_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -deforaos-libdesktop
diff --git a/deforaos-libdesktop/distinfo b/deforaos-libdesktop/distinfo
deleted file mode 100644
index 359ac1b2a7..0000000000
--- a/deforaos-libdesktop/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.14 2015/06/13 20:54:42 khorben Exp $
-
-SHA1 (libDesktop-0.2.0.tar.gz) = 5915629202ea0e9ae9b2c6929644fab3570802df
-RMD160 (libDesktop-0.2.0.tar.gz) = 60f6fbee77bdb7524d0908db24ff21ea170f82a3
-Size (libDesktop-0.2.0.tar.gz) = 17698 bytes
-SHA1 (patch-data_libDesktop.pc.in) = fb8262126d3cd81f353112c865a61ec6be3c5601
-SHA1 (patch-src_Makefile) = d5e6c8dd9941ac530cbab1615df51fc0360785c8
-SHA1 (patch-tests_Makefile) = cf1175dfc01030c1af3c269e561b617d13667b71
-SHA1 (patch-tools_Makefile) = 4ad181d2b1d5cf610c6bf6690b2879caf3d92493
diff --git a/deforaos-libdesktop/patches/patch-data_libDesktop.pc.in b/deforaos-libdesktop/patches/patch-data_libDesktop.pc.in
deleted file mode 100644
index 68bcc93c74..0000000000
--- a/deforaos-libdesktop/patches/patch-data_libDesktop.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-data_libDesktop.pc.in,v 1.3 2015/06/13 20:54:43 khorben Exp $
-
-Build with Gtk+ 3 by default
-
---- data/libDesktop.pc.in.orig 2014-03-29 19:25:14.000000000 +0000
-+++ data/libDesktop.pc.in
-@@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib
- Name: @PACKAGE@
- Description: DeforaOS Desktop helper library
- Version: @VERSION@
--Requires: libSystem gtk+-2.0
-+Requires: libSystem gtk+-3.0
- Cflags: -I${includedir}
- Libs: @RPATH@ -L${libdir} -lDesktop
diff --git a/deforaos-libdesktop/patches/patch-src_Makefile b/deforaos-libdesktop/patches/patch-src_Makefile
deleted file mode 100644
index b558b9beff..0000000000
--- a/deforaos-libdesktop/patches/patch-src_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.3 2015/06/13 20:54:43 khorben Exp $
-
-Build with Gtk+ 3 by default
-
---- src/Makefile.orig 2015-05-25 16:43:44.000000000 +0000
-+++ src/Makefile
-@@ -6,9 +6,9 @@ LIBDIR = $(PREFIX)/lib
- CC = cc
- CPPFLAGSF= -I ../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2 -fPIC -pedantic
--LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs libSystem gtk+-3.0`
- AR = ar
- RANLIB = ranlib
- CCSHARED= $(CC) -shared
diff --git a/deforaos-libdesktop/patches/patch-tests_Makefile b/deforaos-libdesktop/patches/patch-tests_Makefile
deleted file mode 100644
index f308fe2685..0000000000
--- a/deforaos-libdesktop/patches/patch-tests_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tests_Makefile,v 1.1 2015/06/13 20:54:43 khorben Exp $
-
-Build with Gtk+ 3 by default
-
---- tests/Makefile.orig 2015-05-25 16:43:44.000000000 +0000
-+++ tests/Makefile
-@@ -7,9 +7,9 @@ SBINDIR = $(PREFIX)/sbin
- CC = cc
- CPPFLAGSF= -I ../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2 -pedantic
--LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs libSystem gtk+-3.0`
- LDFLAGS = $(OBJDIR)../src/libDesktop.a
- RM = rm -f
- LN = ln -f
diff --git a/deforaos-libdesktop/patches/patch-tools_Makefile b/deforaos-libdesktop/patches/patch-tools_Makefile
deleted file mode 100644
index 2f053b7604..0000000000
--- a/deforaos-libdesktop/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2015/06/13 20:54:43 khorben Exp $
-
-Build with Gtk+ 3 by default
-
---- tools/Makefile.orig 2015-05-25 16:43:44.000000000 +0000
-+++ tools/Makefile
-@@ -7,9 +7,9 @@ SBINDIR = $(PREFIX)/sbin
- CC = cc
- CPPFLAGSF= -I ../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2 -pedantic
--LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs libSystem gtk+-3.0`
- LDFLAGS = $(OBJDIR)../src/libDesktop.a
- RM = rm -f
- LN = ln -f
diff --git a/deforaos-locker/DESCR b/deforaos-locker/DESCR
deleted file mode 100644
index e66eda7df2..0000000000
--- a/deforaos-locker/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS desktop screensaver
-
-This is the GTK3 version.
diff --git a/deforaos-locker/Makefile b/deforaos-locker/Makefile
deleted file mode 100644
index 767ee57456..0000000000
--- a/deforaos-locker/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2014/06/26 12:24:32 khorben Exp $
-
-DISTNAME= Locker-0.2.2
-PKGNAME= deforaos-locker-0.2.2
-CATEGORIES= x11
-MASTER_SITES= https://www.defora.org/os/download/download/4329/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop screensaver
-
-LICENSE= gnu-gpl-v3
-
-USE_TOOLS+= pkg-config
-USE_TOOLS+= xgettext
-
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-AUTO_MKDIRS= yes
-
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/locker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/locker.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/lockerctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lockerctl.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/locker.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/locker.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/lockerctl.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/lockerctl.html
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man
-
-.include "options.mk"
-
-.include "../../wip/deforaos-libdesktop/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../wip/deforaos-panel/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-locker/PLIST b/deforaos-locker/PLIST
deleted file mode 100644
index 282da1e365..0000000000
--- a/deforaos-locker/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2014/06/26 12:24:32 khorben Exp $
-bin/locker
-bin/lockerctl
-include/Desktop/Locker.h
-include/Desktop/Locker/auth.h
-include/Desktop/Locker/demo.h
-include/Desktop/Locker/locker.h
-include/Desktop/Locker/plugin.h
-lib/Locker/auth/password.so
-lib/Locker/auth/slider.so
-lib/Locker/demos/colors.so
-lib/Locker/demos/xscreensaver.so
-lib/Locker/demos/xterm.so
-lib/Locker/plugins/openmoko.so
-lib/Locker/plugins/panel.so
-lib/Locker/plugins/suspend.so
-lib/Locker/plugins/systray.so
-man/man1/locker.1
-man/man1/lockerctl.1
-share/applications/deforaos-locker-settings.desktop
-share/doc/html/Locker/locker.html
-share/doc/html/Locker/lockerctl.html
-share/locale/fr/LC_MESSAGES/Locker.mo
diff --git a/deforaos-locker/buildlink3.mk b/deforaos-locker/buildlink3.mk
deleted file mode 100644
index 6118bb5922..0000000000
--- a/deforaos-locker/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/01/09 16:11:52 khorben Exp $
-
-BUILDLINK_TREE+= deforaos-locker
-
-.if !defined(DEFORAOS_LOCKER_BUILDLINK3_MK)
-DEFORAOS_LOCKER_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.deforaos-locker+= deforaos-locker>=0.1.2
-BUILDLINK_PKGSRCDIR.deforaos-locker?= ../../wip/deforaos-locker
-
-.include "../../wip/deforaos-libdesktop/buildlink3.mk"
-.endif # DEFORAOS_LOCKER_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -deforaos-locker
diff --git a/deforaos-locker/distinfo b/deforaos-locker/distinfo
deleted file mode 100644
index 7d6f7d43a6..0000000000
--- a/deforaos-locker/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.9 2014/06/26 12:26:35 khorben Exp $
-
-SHA1 (Locker-0.2.2.tar.gz) = cf780abf63f9dc56345dff1723202b3a3956ed9b
-RMD160 (Locker-0.2.2.tar.gz) = 415d3410ddcb98dda57f866887e5cbbaccae0664
-Size (Locker-0.2.2.tar.gz) = 53643 bytes
-SHA1 (patch-src_auth_Makefile) = af070e360dbfc58b826a5eb73c8e0e0c673936f2
-SHA1 (patch-src_demos_Makefile) = 166913e734581575dec33637c0e1a13bc1f35444
-SHA1 (patch-src_plugins_Makefile) = bfedc6329cba7370dc408afea4aa4f4bcbf53e2e
-SHA1 (patch-tools_Makefile) = c50f6b16dd0783e041d182071558884a47b87c2f
diff --git a/deforaos-locker/options.mk b/deforaos-locker/options.mk
deleted file mode 100644
index 4b0864f2e8..0000000000
--- a/deforaos-locker/options.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2012/04/18 23:38:23 khorben Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.deforaos-locker
-PKG_SUPPORTED_OPTIONS= embedded
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+= CPPFLAGS=-DEMBEDDED
-.endif
diff --git a/deforaos-locker/patches/patch-src_auth_Makefile b/deforaos-locker/patches/patch-src_auth_Makefile
deleted file mode 100644
index efe17834df..0000000000
--- a/deforaos-locker/patches/patch-src_auth_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_auth_Makefile,v 1.3 2014/06/26 12:26:35 khorben Exp $
-
-Build with Gtk+ 3.0 by default
-
---- src/auth/Makefile.orig 2014-06-26 02:00:28.000000000 +0000
-+++ src/auth/Makefile
-@@ -5,9 +5,9 @@ LIBDIR = $(PREFIX)/lib
- CC = cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2 -pedantic -fPIC
--LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= -W `pkg-config --libs libSystem gtk+-3.0`
- AR = ar
- RANLIB = ranlib
- CCSHARED= $(CC) -shared
diff --git a/deforaos-locker/patches/patch-src_demos_Makefile b/deforaos-locker/patches/patch-src_demos_Makefile
deleted file mode 100644
index c8b389f206..0000000000
--- a/deforaos-locker/patches/patch-src_demos_Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_demos_Makefile,v 1.2 2014/06/26 12:26:35 khorben Exp $
-
-Build with Gtk+ 3.0 by default
-
---- src/demos/Makefile.orig 2014-06-26 02:00:28.000000000 +0000
-+++ src/demos/Makefile
-@@ -1,13 +1,13 @@
--TARGETS = colors.so gtk-demo.so logo.so template.so xscreensaver.so xterm.so
-+TARGETS = colors.so template.so xscreensaver.so xterm.so
- PREFIX = /usr/local
- DESTDIR =
- LIBDIR = $(PREFIX)/lib
- CC = cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0 x11`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0 x11`
- CFLAGS = -Wall -g -O2 -pedantic -fPIC
--LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0 x11`
-+LDFLAGSF= -W `pkg-config --libs libSystem gtk+-3.0 x11`
- AR = ar
- RANLIB = ranlib
- CCSHARED= $(CC) -shared
-@@ -89,10 +89,6 @@ install: $(TARGETS)
- $(MKDIR) $(DESTDIR)$(LIBDIR)/Locker/demos
- $(INSTALL) -m 0644 colors.so $(DESTDIR)$(LIBDIR)/Locker/demos/colors.so
- $(MKDIR) $(DESTDIR)$(LIBDIR)/Locker/demos
-- $(INSTALL) -m 0644 gtk-demo.so $(DESTDIR)$(LIBDIR)/Locker/demos/gtk-demo.so
-- $(MKDIR) $(DESTDIR)$(LIBDIR)/Locker/demos
-- $(INSTALL) -m 0644 logo.so $(DESTDIR)$(LIBDIR)/Locker/demos/logo.so
-- $(MKDIR) $(DESTDIR)$(LIBDIR)/Locker/demos
- $(INSTALL) -m 0644 xscreensaver.so $(DESTDIR)$(LIBDIR)/Locker/demos/xscreensaver.so
- $(MKDIR) $(DESTDIR)$(LIBDIR)/Locker/demos
- $(INSTALL) -m 0644 xterm.so $(DESTDIR)$(LIBDIR)/Locker/demos/xterm.so
diff --git a/deforaos-locker/patches/patch-src_plugins_Makefile b/deforaos-locker/patches/patch-src_plugins_Makefile
deleted file mode 100644
index 2a49cb17a5..0000000000
--- a/deforaos-locker/patches/patch-src_plugins_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_plugins_Makefile,v 1.2 2014/06/26 12:26:35 khorben Exp $
-
-Build with Gtk+ 3.0 by default
-
---- src/plugins/Makefile.orig 2014-06-26 02:00:28.000000000 +0000
-+++ src/plugins/Makefile
-@@ -5,9 +5,9 @@ LIBDIR = $(PREFIX)/lib
- CC = cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2 -pedantic -fPIC
--LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= -W `pkg-config --libs libSystem gtk+-3.0`
- AR = ar
- RANLIB = ranlib
- CCSHARED= $(CC) -shared
diff --git a/deforaos-locker/patches/patch-tools_Makefile b/deforaos-locker/patches/patch-tools_Makefile
deleted file mode 100644
index 2542a662a9..0000000000
--- a/deforaos-locker/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.2 2014/06/26 12:26:35 khorben Exp $
-
-Build with Gtk+ 3.0 by default
-
---- tools/Makefile.orig 2014-06-26 02:00:28.000000000 +0000
-+++ tools/Makefile
-@@ -6,9 +6,9 @@ SBINDIR = $(PREFIX)/sbin
- CC = cc
- CPPFLAGSF=
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2
--LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs libSystem gtk+-3.0`
- RM = rm -f
- LN = ln -f
- MKDIR = mkdir -m 0755 -p
diff --git a/deforaos-panel/DESCR b/deforaos-panel/DESCR
deleted file mode 100644
index 9c214cd1a6..0000000000
--- a/deforaos-panel/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS desktop panel
-
-This is the GTK3 version.
diff --git a/deforaos-panel/Makefile b/deforaos-panel/Makefile
deleted file mode 100644
index 2159ec7e82..0000000000
--- a/deforaos-panel/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2014/10/25 00:00:42 khorben Exp $
-#
-
-DISTNAME= Panel-0.3.1
-PKGNAME= deforaos-panel-0.3.1
-CATEGORIES= x11
-MASTER_SITES= https://www.defora.org/os/download/download/4338/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop panel
-
-LICENSE= gnu-gpl-v3
-
-USE_TOOLS+= pkg-config
-USE_TOOLS+= xgettext
-
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-AUTO_MKDIRS= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${PKGMANDIR} != "share/man"
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel-embed.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel-embed.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel-message.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel-message.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel-notify.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel-notify.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panelctl.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panelctl.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/wifibrowser.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/wifibrowser.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel-embed.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel-embed.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel-message.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel-message.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel-notify.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel-notify.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panelctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panelctl.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/wifibrowser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/wifibrowser.1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man
-.endif
-
-.include "options.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../wip/deforaos-libdesktop/buildlink3.mk"
-.include "../../wip/deforaos-browser/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-#.include "../../multimedia/deforaos-player/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-panel/PLIST b/deforaos-panel/PLIST
deleted file mode 100644
index 602242c19a..0000000000
--- a/deforaos-panel/PLIST
+++ /dev/null
@@ -1,77 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2014/10/25 00:00:42 khorben Exp $
-bin/panel
-bin/panel-embed
-bin/panel-message
-bin/panel-notify
-bin/panelctl
-bin/run
-bin/wifibrowser
-include/Desktop/Panel.h
-lib/Panel/applets/battery.so
-lib/Panel/applets/bluetooth.so
-lib/Panel/applets/clock.so
-lib/Panel/applets/close.so
-lib/Panel/applets/cpu.so
-lib/Panel/applets/cpufreq.so
-lib/Panel/applets/desktop.so
-lib/Panel/applets/embed.so
-lib/Panel/applets/gps.so
-lib/Panel/applets/gsm.so
-lib/Panel/applets/lock.so
-lib/Panel/applets/logout.so
-lib/Panel/applets/main.so
-lib/Panel/applets/memory.so
-lib/Panel/applets/mixer.so
-lib/Panel/applets/network.so
-lib/Panel/applets/pager.so
-lib/Panel/applets/phone.so
-lib/Panel/applets/player.so
-lib/Panel/applets/rotate.so
-lib/Panel/applets/separator.so
-lib/Panel/applets/spacer.so
-lib/Panel/applets/swap.so
-lib/Panel/applets/systray.so
-lib/Panel/applets/tasks.so
-lib/Panel/applets/title.so
-lib/Panel/applets/usb.so
-lib/Panel/applets/user.so
-lib/Panel/applets/volume.so
-lib/Panel/applets/wpa_supplicant.so
-lib/libPanel.a
-lib/libPanel.so
-lib/libPanel.so.0
-lib/libPanel.so.0.0
-lib/pkgconfig/Panel.pc
-man/html1/panel-embed.html
-man/html1/panel-message.html
-man/html1/panel-notify.html
-man/html1/panel.html
-man/html1/panelctl.html
-man/html1/wifibrowser.html
-man/man1/panel-embed.1
-man/man1/panel-message.1
-man/man1/panel-notify.1
-man/man1/panel.1
-man/man1/panelctl.1
-man/man1/wifibrowser.1
-share/applications/deforaos-panel-settings.desktop
-share/applications/deforaos-wifibrowser.desktop
-share/icons/hicolor/16x16/apps/panel-applet-bluetooth.png
-share/icons/hicolor/16x16/apps/panel-applet-desktop.png
-share/icons/hicolor/16x16/apps/panel-applet-usb.png
-share/icons/hicolor/16x16/apps/panel-settings.png
-share/icons/hicolor/22x22/apps/panel-applet-bluetooth.png
-share/icons/hicolor/22x22/apps/panel-applet-desktop.png
-share/icons/hicolor/22x22/apps/panel-settings.png
-share/icons/hicolor/24x24/apps/panel-applet-bluetooth.png
-share/icons/hicolor/24x24/apps/panel-applet-desktop.png
-share/icons/hicolor/24x24/apps/panel-applet-usb.png
-share/icons/hicolor/24x24/apps/panel-settings.png
-share/icons/hicolor/32x32/apps/panel-applet-bluetooth.png
-share/icons/hicolor/32x32/apps/panel-applet-desktop.png
-share/icons/hicolor/32x32/apps/panel-settings.png
-share/icons/hicolor/48x48/apps/panel-applet-bluetooth.png
-share/icons/hicolor/48x48/apps/panel-applet-desktop.png
-share/icons/hicolor/48x48/apps/panel-settings.png
-share/icons/hicolor/scalable/apps/panel-applet-bluetooth.svg
-share/locale/fr/LC_MESSAGES/Panel.mo
diff --git a/deforaos-panel/buildlink3.mk b/deforaos-panel/buildlink3.mk
deleted file mode 100644
index 8ec9a41e6b..0000000000
--- a/deforaos-panel/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2015/01/27 00:10:10 khorben Exp $
-#
-
-BUILDLINK_TREE+= deforaos-panel
-
-.if !defined(DEFORAOS_PANEL_BUILDLINK3_MK)
-DEFORAOS_PANEL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.deforaos-panel+= deforaos-panel>=0.2.12
-BUILDLINK_PKGSRCDIR.deforaos-panel?= ../../wip/deforaos-panel
-
-.include "../../devel/deforaos-libsystem/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.endif # DEFORAOS_PANEL_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -deforaos-panel
diff --git a/deforaos-panel/distinfo b/deforaos-panel/distinfo
deleted file mode 100644
index 274f3d7753..0000000000
--- a/deforaos-panel/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.21 2014/10/25 00:00:42 khorben Exp $
-
-SHA1 (Panel-0.3.1.tar.gz) = 0a2d9d424b8b316d8a6db087c8cb2dddaaa47347
-RMD160 (Panel-0.3.1.tar.gz) = 3e2fe1e8f1cf2a4c27cdf355bf5c00685d5ada9a
-Size (Panel-0.3.1.tar.gz) = 133677 bytes
-SHA1 (patch-data_Panel.pc.in) = c650bb1875d73466e0a9fe86e82fcfa3c9ca1527
-SHA1 (patch-data_pkgconfig.sh) = 7c40652087c604cff593a320e97259c453633c74
-SHA1 (patch-src_Makefile) = d5024940f966122276dbf24166893475cc39aaf2
-SHA1 (patch-src_applets_Makefile) = 74f382d08048d6deb51aa38e6fcd8d56cd4206f2
-SHA1 (patch-src_applets_main.c) = 07382b429402b750800bcec490a4e911d6c4ec49
-SHA1 (patch-src_applets_memory.c) = 858dc9f03fa32e01d3d02d49d13742cda7b0193e
-SHA1 (patch-src_applets_swap.c) = b23884942caea5416a1809321edd36a36ed2ec17
-SHA1 (patch-src_applets_volume.c) = cc921f78c1b99bd645c89b3228b36a38c23a8294
-SHA1 (patch-src_panel.c) = 9423e1a6c3535be8d90a40c9b2f70a5cbff2ac78
-SHA1 (patch-tools_Makefile) = 642887110b585cd6b78d0cf43acc4f826b1abcae
diff --git a/deforaos-panel/options.mk b/deforaos-panel/options.mk
deleted file mode 100644
index 1cbc48681d..0000000000
--- a/deforaos-panel/options.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2012/12/24 03:44:13 khorben Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.deforaos-panel
-PKG_SUPPORTED_OPTIONS= embedded
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+= CPPFLAGS=-DEMBEDDED
-.endif
diff --git a/deforaos-panel/patches/patch-data_Panel.pc.in b/deforaos-panel/patches/patch-data_Panel.pc.in
deleted file mode 100644
index dfd7fbb0ac..0000000000
--- a/deforaos-panel/patches/patch-data_Panel.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-data_Panel.pc.in,v 1.1 2014/06/26 12:02:20 khorben Exp $
-
-Compile Panel applets with Gtk+ 3.0
-
---- data/Panel.pc.in.orig 2013-02-04 22:23:50.000000000 +0000
-+++ data/Panel.pc.in
-@@ -6,5 +6,5 @@ libdir=${exec_prefix}/lib
- Name: Panel
- Description: DeforaOS Desktop Panel plug-ins
- Version: @VERSION@
--Requires: gtk+-2.0
-+Requires: gtk+-3.0
- Cflags: -I${includedir}
diff --git a/deforaos-panel/patches/patch-data_pkgconfig.sh b/deforaos-panel/patches/patch-data_pkgconfig.sh
deleted file mode 100644
index 1b15b7b41d..0000000000
--- a/deforaos-panel/patches/patch-data_pkgconfig.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-data_pkgconfig.sh,v 1.1 2014/10/25 00:00:42 khorben Exp $
-
-Use correct rpath flag on SunOS.
-
---- data/pkgconfig.sh.orig 2014-04-23 15:37:45.000000000 +0000
-+++ data/pkgconfig.sh
-@@ -129,9 +129,12 @@ while [ $# -gt 0 ]; do
- if [ "$PREFIX" != "/usr" ]; then
- RPATH="-Wl,-rpath-link,\${libdir} -Wl,-rpath,\${libdir}"
- case $(uname -s) in
-- Darwin|SunOS)
-+ Darwin)
- RPATH="-Wl,-rpath,\${libdir}"
- ;;
-+ SunOS)
-+ RPATH="-Wl,-R\${libdir}"
-+ ;;
- esac
- fi
-
diff --git a/deforaos-panel/patches/patch-src_Makefile b/deforaos-panel/patches/patch-src_Makefile
deleted file mode 100644
index c5497e3e6d..0000000000
--- a/deforaos-panel/patches/patch-src_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.2 2014/10/25 00:00:42 khorben Exp $
-
-Build run(1) with Gtk+ 3.0
-
---- src/Makefile.orig 2014-10-23 17:35:58.000000000 +0000
-+++ src/Makefile
-@@ -52,8 +52,8 @@ panelctl: $(panelctl_OBJS)
- $(CC) -o panelctl $(panelctl_OBJS) $(panelctl_LDFLAGS)
-
- run_OBJS = run.o
--run_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
--run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lintl
-+run_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-3.0`
-+run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-3.0` -lintl
-
- run: $(run_OBJS)
- $(CC) -o run $(run_OBJS) $(run_LDFLAGS)
diff --git a/deforaos-panel/patches/patch-src_applets_Makefile b/deforaos-panel/patches/patch-src_applets_Makefile
deleted file mode 100644
index 92b06f50bb..0000000000
--- a/deforaos-panel/patches/patch-src_applets_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_applets_Makefile,v 1.2 2014/10/25 00:00:42 khorben Exp $
-
-Build the panel applets with Gtk+ 3.0
-The "embed" panel applet requires an additional library with Gtk+ 3.0
-
---- src/applets/Makefile.orig 2014-10-23 17:35:58.000000000 +0000
-+++ src/applets/Makefile
-@@ -5,9 +5,9 @@ LIBDIR = $(PREFIX)/lib
- CC = cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0` -fPIC
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0` -fPIC
- CFLAGS = -Wall -g -O2 -pedantic
--LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0`
-+LDFLAGSF= `pkg-config --libs libSystem gtk+-3.0`
- AR = ar
- RANLIB = ranlib
- CCSHARED= $(CC) -shared
-@@ -69,8 +69,8 @@ desktop.so: $(desktop_OBJS)
- $(CCSHARED) -o desktop.so $(desktop_OBJS) $(desktop_LDFLAGS)
-
- embed_OBJS = embed.o
--embed_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop`
--embed_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop`
-+embed_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop gtk+-x11-3.0`
-+embed_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop gtk+-x11-3.0`
-
- embed.so: $(embed_OBJS)
- $(CCSHARED) -o embed.so $(embed_OBJS) $(embed_LDFLAGS)
diff --git a/deforaos-panel/patches/patch-src_applets_embed.c b/deforaos-panel/patches/patch-src_applets_embed.c
deleted file mode 100644
index 3f69517d54..0000000000
--- a/deforaos-panel/patches/patch-src_applets_embed.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_applets_embed.c,v 1.1 2014/06/26 12:02:20 khorben Exp $
-
-Build fix for Gtk+ 3.0
-
---- src/applets/embed.c.orig 2013-04-13 20:30:34.000000000 +0000
-+++ src/applets/embed.c
-@@ -24,6 +24,9 @@
- #include <string.h>
- #include <System.h>
- #include <Desktop.h>
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+# include <gtk/gtkx.h>
-+#endif
- #include "Panel.h"
-
-
-@@ -33,7 +36,11 @@
- typedef struct _EmbedWidget
- {
- GtkWidget * socket;
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+ unsigned long id;
-+#else
- GdkNativeWindow id;
-+#endif
- } EmbedWidget;
-
- typedef struct _PanelApplet
diff --git a/deforaos-panel/patches/patch-src_applets_main.c b/deforaos-panel/patches/patch-src_applets_main.c
deleted file mode 100644
index aca18bf584..0000000000
--- a/deforaos-panel/patches/patch-src_applets_main.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_applets_main.c,v 1.1 2014/10/25 00:00:42 khorben Exp $
-
-Need sys/fcntl.h for O_RDONLY on SunOS.
-
---- src/applets/main.c.orig 2014-10-23 17:34:42.000000000 +0000
-+++ src/applets/main.c
-@@ -16,6 +16,9 @@
-
-
- #include <sys/stat.h>
-+#if defined(__sun)
-+# include <fcntl.h>
-+#endif
- #include <dirent.h>
- #include <unistd.h>
- #include <stdlib.h>
diff --git a/deforaos-panel/patches/patch-src_applets_memory.c b/deforaos-panel/patches/patch-src_applets_memory.c
deleted file mode 100644
index 6200499c40..0000000000
--- a/deforaos-panel/patches/patch-src_applets_memory.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_applets_memory.c,v 1.1 2014/10/25 00:00:42 khorben Exp $
-
---- src/applets/memory.c.orig 2014-06-27 11:22:53.000000000 +0000
-+++ src/applets/memory.c
-@@ -21,12 +21,13 @@
- #include <errno.h>
- #if defined(__linux__)
- # include <sys/sysinfo.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
-+# include <sys/sysctl.h>
-+# include <sys/vmmeter.h>
-+# include <vm/vm_param.h>
-+#elif defined(__NetBSD__)
- # include <sys/sysctl.h>
- # include <sys/vmmeter.h>
--# if defined(__FreeBSD__)
--# include <vm/vm_param.h>
--# endif
- #endif
- #include <libintl.h>
- #include "Panel.h"
diff --git a/deforaos-panel/patches/patch-src_applets_swap.c b/deforaos-panel/patches/patch-src_applets_swap.c
deleted file mode 100644
index 37209aac4e..0000000000
--- a/deforaos-panel/patches/patch-src_applets_swap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_applets_swap.c,v 1.1 2014/10/25 00:00:42 khorben Exp $
-
---- src/applets/swap.c.orig 2014-06-27 11:23:35.000000000 +0000
-+++ src/applets/swap.c
-@@ -23,6 +23,7 @@
- # include <sys/sysinfo.h>
- #elif defined(__NetBSD__)
- # include <sys/sysctl.h>
-+# include <uvm/uvm_extern.h>
- #endif
- #include <libintl.h>
- #include "Panel.h"
diff --git a/deforaos-panel/patches/patch-src_applets_volume.c b/deforaos-panel/patches/patch-src_applets_volume.c
deleted file mode 100644
index 0b60da5f49..0000000000
--- a/deforaos-panel/patches/patch-src_applets_volume.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_applets_volume.c,v 1.1 2014/10/25 00:00:42 khorben Exp $
-
-Fix SunOS includes.
-
---- src/applets/volume.c.orig 2014-05-16 19:42:45.000000000 +0000
-+++ src/applets/volume.c
-@@ -19,7 +19,7 @@
-
-
- #include <sys/ioctl.h>
--#if defined(__NetBSD__) || defined(__sun__)
-+#if defined(__NetBSD__)
- # include <sys/audioio.h>
- #elif defined(__linux__)
- # include <alsa/asoundlib.h>
diff --git a/deforaos-panel/patches/patch-src_panel.c b/deforaos-panel/patches/patch-src_panel.c
deleted file mode 100644
index 018a5436c5..0000000000
--- a/deforaos-panel/patches/patch-src_panel.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-src_panel.c,v 1.1 2014/10/25 00:00:42 khorben Exp $
-
-Fix for Gtk+ 2.24
-
---- src/panel.c.orig 2014-10-23 09:38:39.000000000 +0000
-+++ src/panel.c
-@@ -768,7 +768,7 @@ static GtkWidget * _preferences_window_p
- for(i = 0; i < sizeof(titles) / sizeof(*titles); i++)
- {
- #if GTK_CHECK_VERSION(2, 24, 0)
-- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _(titles[i]));
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), _(titles[i]));
- #else
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _(titles[i]));
- #endif
-@@ -782,11 +782,11 @@ static GtkWidget * _preferences_window_p
- FALSE, TRUE, 0);
- gtk_widget_set_no_show_all(panel->pr_panels[i].enabled, TRUE);
- /* size */
--#if GTK_CHECK_VERSION(3, 0, 0)
-+#if GTK_CHECK_VERSION(2, 24, 0)
- panel->pr_panels[i].size = gtk_combo_box_text_new();
-- gtk_combo_box_text_append(
-+ gtk_combo_box_text_append_text(
- GTK_COMBO_BOX_TEXT(panel->pr_panels[i].size),
-- NULL, _("Default"));
-+ _("Default"));
- #else
- panel->pr_panels[i].size = gtk_combo_box_new_text();
- gtk_combo_box_append_text(
-@@ -796,9 +796,9 @@ static GtkWidget * _preferences_window_p
- for(j = 0; j < sizeof(_panel_sizes) / sizeof(*_panel_sizes);
- j++)
- {
--#if GTK_CHECK_VERSION(3, 0, 0)
-- gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(
-- panel->pr_panels[i].size), NULL,
-+#if GTK_CHECK_VERSION(2, 24, 0)
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(
-+ panel->pr_panels[i].size),
- _(_panel_sizes[j].alias));
- #else
- gtk_combo_box_append_text(
diff --git a/deforaos-panel/patches/patch-tools_Makefile b/deforaos-panel/patches/patch-tools_Makefile
deleted file mode 100644
index fe7619b17a..0000000000
--- a/deforaos-panel/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.4 2014/10/25 00:00:42 khorben Exp $
-
---- tools/Makefile.orig 2014-10-23 17:35:58.000000000 +0000
-+++ tools/Makefile
-@@ -2,6 +2,7 @@ TARGETS = panel-embed panel-message pane
- PREFIX = /usr/local
- DESTDIR =
- BINDIR = $(PREFIX)/bin
-+LIBDIR = $(PREFIX)/lib
- SBINDIR = $(PREFIX)/sbin
- CC = cc
- CPPFLAGSF=
diff --git a/deforaos-panel/patches/patch-tools_message.c b/deforaos-panel/patches/patch-tools_message.c
deleted file mode 100644
index e92cf98687..0000000000
--- a/deforaos-panel/patches/patch-tools_message.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-tools_message.c,v 1.1 2014/06/26 12:02:20 khorben Exp $
-
-Build fix for Gtk+ 3.0
-
---- tools/message.c.orig 2013-02-04 22:23:50.000000000 +0000
-+++ tools/message.c
-@@ -20,6 +20,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <Desktop.h>
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+# include <gtk/gtkx.h>
-+#endif
- #include "../include/Panel.h"
-
-
diff --git a/deforaos-phone/DESCR b/deforaos-phone/DESCR
deleted file mode 100644
index 2edcc8c949..0000000000
--- a/deforaos-phone/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS GSM telephony application
-
-This is the GTK3 version.
diff --git a/deforaos-phone/Makefile b/deforaos-phone/Makefile
deleted file mode 100644
index 14b9349850..0000000000
--- a/deforaos-phone/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2014/10/23 18:36:21 khorben Exp $
-#
-
-DISTNAME= Phone-0.4.1
-PKGNAME= deforaos-phone-0.4.1
-PKGREVISION= 1
-CATEGORIES= comms net
-MASTER_SITES= https://www.defora.org/os/download/download/4336/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop telephony
-
-LICENSE= gnu-gpl-v3
-
-USE_TOOLS+= pkg-config
-USE_TOOLS+= xgettext
-
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-AUTO_MKDIRS= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${PKGMANDIR} != "share/man"
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/gprs.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/gprs.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/phone.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/phone.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/phonectl.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/phonectl.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/gprs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gprs.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/phone.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phone.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/phonectl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phonectl.1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man
-.endif
-
-.include "../../wip/deforaos-libdesktop/buildlink3.mk"
-.include "../../chat/libpurple/buildlink3.mk"
-.include "../../devel/sofia-sip/buildlink3.mk"
-.include "../../wip/deforaos-locker/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-phone/PLIST b/deforaos-phone/PLIST
deleted file mode 100644
index fa47dc8cb4..0000000000
--- a/deforaos-phone/PLIST
+++ /dev/null
@@ -1,97 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2014/10/23 18:36:21 khorben Exp $
-bin/gprs
-bin/phone
-bin/phonectl
-include/Desktop/Phone.h
-include/Desktop/Phone/modem.h
-include/Desktop/Phone/modems/hayes.h
-include/Desktop/Phone/phone.h
-include/Desktop/Phone/plugin.h
-lib/Phone/modem/debug.so
-lib/Phone/modem/hayes.so
-lib/Phone/modem/purple.so
-lib/Phone/modem/sofia.so
-lib/Phone/plugins/blacklist.so
-lib/Phone/plugins/debug.so
-lib/Phone/plugins/engineering.so
-lib/Phone/plugins/gprs.so
-lib/Phone/plugins/gps.so
-lib/Phone/plugins/locker.so
-lib/Phone/plugins/n900.so
-lib/Phone/plugins/notify.so
-lib/Phone/plugins/openmoko.so
-lib/Phone/plugins/oss.so
-lib/Phone/plugins/panel.so
-lib/Phone/plugins/password.so
-lib/Phone/plugins/profiles.so
-lib/Phone/plugins/smscrypt.so
-lib/Phone/plugins/systray.so
-lib/Phone/plugins/ussd.so
-man/html1/gprs.html
-man/html1/phone.html
-man/html1/phonectl.html
-man/man1/gprs.1
-man/man1/phone.1
-man/man1/phonectl.1
-share/applications/deforaos-phone-contacts.desktop
-share/applications/deforaos-phone-dialer.desktop
-share/applications/deforaos-phone-log.desktop
-share/applications/deforaos-phone-messages.desktop
-share/applications/deforaos-phone-settings.desktop
-share/applications/deforaos-phone-sofia.desktop
-share/doc/Phone/gprs.conf
-share/doc/Phone/phone.conf
-share/doc/Phone/pppd-chat_gprs
-share/doc/Phone/pppd-peers_gprs
-share/doc/Phone/pppd-peers_phone
-share/icons/hicolor/16x16/apps/phone-drafts.png
-share/icons/hicolor/16x16/apps/phone-gprs.png
-share/icons/hicolor/16x16/apps/phone-inbox.png
-share/icons/hicolor/16x16/apps/phone-n900.png
-share/icons/hicolor/16x16/apps/phone-openmoko.png
-share/icons/hicolor/16x16/apps/phone-roaming.png
-share/icons/hicolor/16x16/apps/phone-sent.png
-share/icons/hicolor/22x22/apps/phone-gprs.png
-share/icons/hicolor/22x22/apps/phone-signal-00.png
-share/icons/hicolor/22x22/apps/phone-signal-100.png
-share/icons/hicolor/22x22/apps/phone-signal-25.png
-share/icons/hicolor/22x22/apps/phone-signal-50.png
-share/icons/hicolor/22x22/apps/phone-signal-75.png
-share/icons/hicolor/24x24/apps/phone-drafts.png
-share/icons/hicolor/24x24/apps/phone-gprs.png
-share/icons/hicolor/24x24/apps/phone-inbox.png
-share/icons/hicolor/24x24/apps/phone-n900.png
-share/icons/hicolor/24x24/apps/phone-openmoko.png
-share/icons/hicolor/24x24/apps/phone-roaming.png
-share/icons/hicolor/24x24/apps/phone-sent.png
-share/icons/hicolor/32x32/apps/phone-gprs.png
-share/icons/hicolor/32x32/apps/phone-n900.png
-share/icons/hicolor/32x32/apps/phone-openmoko.png
-share/icons/hicolor/32x32/apps/phone-roaming.png
-share/icons/hicolor/48x48/apps/phone-gprs.png
-share/icons/hicolor/48x48/apps/phone-inbox.png
-share/icons/hicolor/48x48/apps/phone-n900.png
-share/icons/hicolor/48x48/apps/phone-openmoko.png
-share/icons/hicolor/48x48/apps/phone-roaming.png
-share/icons/hicolor/48x48/apps/phone-sent.png
-share/locale/fr/LC_MESSAGES/Phone.mo
-share/sounds/Phone/0.wav
-share/sounds/Phone/1.wav
-share/sounds/Phone/2.wav
-share/sounds/Phone/3.wav
-share/sounds/Phone/4.wav
-share/sounds/Phone/5.wav
-share/sounds/Phone/6.wav
-share/sounds/Phone/7.wav
-share/sounds/Phone/8.wav
-share/sounds/Phone/9.wav
-share/sounds/Phone/a.wav
-share/sounds/Phone/b.wav
-share/sounds/Phone/busy.wav
-share/sounds/Phone/c.wav
-share/sounds/Phone/d.wav
-share/sounds/Phone/hash.wav
-share/sounds/Phone/keytone.wav
-share/sounds/Phone/ringback.wav
-share/sounds/Phone/ringtone.wav
-share/sounds/Phone/star.wav
diff --git a/deforaos-phone/distinfo b/deforaos-phone/distinfo
deleted file mode 100644
index 1a08faa6b6..0000000000
--- a/deforaos-phone/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.16 2014/10/21 22:16:52 khorben Exp $
-
-SHA1 (Phone-0.4.1.tar.gz) = c4a3c775b8e98ce5ed681c6c7dcb44b3a29b1e44
-RMD160 (Phone-0.4.1.tar.gz) = 83a1f164ed61fa6a134ee40b8cbd0409a6e0096a
-Size (Phone-0.4.1.tar.gz) = 313098 bytes
-SHA1 (patch-src_modems_Makefile) = a777723ac13c87da99eb329be20ebfa2a4330786
-SHA1 (patch-src_plugins_Makefile) = 895e2e4c2587ec5f9c38aab745718c9ac5c1d9e1
-SHA1 (patch-tools_Makefile) = 14815abaa97ae20a656977c0d0a3230a044c3231
diff --git a/deforaos-phone/patches/patch-src_modems_Makefile b/deforaos-phone/patches/patch-src_modems_Makefile
deleted file mode 100644
index a9d772bed5..0000000000
--- a/deforaos-phone/patches/patch-src_modems_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_modems_Makefile,v 1.1 2014/10/21 22:02:25 khorben Exp $
-
-Default to compiling for Gtk+ 3
-
---- src/modems/Makefile.orig 2014-10-20 22:48:49.000000000 +0000
-+++ src/modems/Makefile
-@@ -21,8 +21,8 @@ INCLUDEDIR= $(PREFIX)/include
- all: $(TARGETS)
-
- debug_OBJS = debug.o
--debug_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 libSystem`
--debug_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0 libSystem`
-+debug_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-3.0 libSystem`
-+debug_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-3.0 libSystem`
-
- debug.so: $(debug_OBJS)
- $(CCSHARED) -o debug.so $(debug_OBJS) $(debug_LDFLAGS)
diff --git a/deforaos-phone/patches/patch-src_plugins_Makefile b/deforaos-phone/patches/patch-src_plugins_Makefile
deleted file mode 100644
index 63f30dd749..0000000000
--- a/deforaos-phone/patches/patch-src_plugins_Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_plugins_Makefile,v 1.1 2014/10/21 22:02:25 khorben Exp $
-
-Default to compiling for Gtk+ 3
-
---- src/plugins/Makefile.orig 2014-10-20 22:48:49.000000000 +0000
-+++ src/plugins/Makefile
-@@ -1,14 +1,14 @@
- SUBDIRS = 16x16 24x24 32x32 48x48
--TARGETS = blacklist.so debug.so engineering.so gprs.so gps.so locker.so n900.so notify.so openmoko.so oss.so panel.so password.so profiles.so smscrypt.so systray.so template.so ussd.so video.so
-+TARGETS = blacklist.so debug.so engineering.so gprs.so gps.so locker.so n900.so notify.so openmoko.so oss.so panel.so password.so profiles.so smscrypt.so systray.so template.so ussd.so
- PREFIX = /usr/local
- DESTDIR =
- LIBDIR = $(PREFIX)/lib
- CC = cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF = -W `pkg-config --cflags libSystem gtk+-2.0`
-+CFLAGSF = -W `pkg-config --cflags libSystem gtk+-3.0`
- CFLAGS = -Wall -g -O2 -pedantic -fPIC
--LDFLAGSF= `pkg-config --cflags libSystem gtk+-2.0`
-+LDFLAGSF= `pkg-config --cflags libSystem gtk+-3.0`
- AR = ar
- RANLIB = ranlib
- CCSHARED= $(CC) -shared
-@@ -73,8 +73,8 @@ n900.so: $(n900_OBJS)
- $(CCSHARED) -o n900.so $(n900_OBJS) $(n900_LDFLAGS)
-
- notify_OBJS = notify.o
--notify_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
--notify_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
-+notify_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-x11-3.0`
-+notify_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --cflags gtk+-x11-3.0`
-
- notify.so: $(notify_OBJS)
- $(CCSHARED) -o notify.so $(notify_OBJS) $(notify_LDFLAGS)
diff --git a/deforaos-phone/patches/patch-tools_Makefile b/deforaos-phone/patches/patch-tools_Makefile
deleted file mode 100644
index 387c49ed9d..0000000000
--- a/deforaos-phone/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2014/10/21 22:02:25 khorben Exp $
-
-Default to compiling for Gtk+ 3
-
---- tools/Makefile.orig 2014-10-20 22:48:49.000000000 +0000
-+++ tools/Makefile
-@@ -17,8 +17,8 @@ INSTALL = install
- all: $(TARGETS)
-
- engineering_OBJS = engineering.o
--engineering_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
--engineering_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0`
-+engineering_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-3.0`
-+engineering_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-3.0`
-
- engineering: $(engineering_OBJS)
- $(CC) -o engineering $(engineering_OBJS) $(engineering_LDFLAGS)
-@@ -38,8 +38,8 @@ pdu: $(pdu_OBJS)
- $(CC) -o pdu $(pdu_OBJS) $(pdu_LDFLAGS)
-
- smscrypt_OBJS = smscrypt.o
--smscrypt_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
--smscrypt_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lssl
-+smscrypt_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-3.0`
-+smscrypt_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-3.0` -lssl
-
- smscrypt: $(smscrypt_OBJS)
- $(CC) -o smscrypt $(smscrypt_OBJS) $(smscrypt_LDFLAGS)
diff --git a/deforaos-surfer/DESCR b/deforaos-surfer/DESCR
deleted file mode 100644
index c0b2d4a326..0000000000
--- a/deforaos-surfer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-DeforaOS desktop web browser
-
-This is the GTK3 version.
diff --git a/deforaos-surfer/Makefile b/deforaos-surfer/Makefile
deleted file mode 100644
index 79bd3d63f2..0000000000
--- a/deforaos-surfer/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2015/08/23 13:26:51 thomasklausner Exp $
-
-DISTNAME= Surfer-0.2.7
-PKGNAME= deforaos-surfer-0.2.7
-PKGREVISION= 1
-CATEGORIES= www
-MASTER_SITES= https://www.defora.org/os/download/download/4345/
-
-MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://www.defora.org/
-COMMENT= DeforaOS desktop web browser
-
-LICENSE= gnu-gpl-v3
-
-USE_TOOLS+= pkg-config
-USE_TOOLS+= xgettext
-
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-MAKE_FLAGS+= DESTDIR=${DESTDIR}
-MAKE_FLAGS+= PREFIX=${PREFIX}
-AUTO_MKDIRS= yes
-
-post-install:
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/download.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/download.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/helper.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/helper.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/html1/surfer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/surfer.html
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/download.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/download.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/helper.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/helper.1
- ${MV} ${DESTDIR}${PREFIX}/share/man/man1/surfer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surfer.1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
- ${RMDIR} ${DESTDIR}${PREFIX}/share/man
-
-.include "options.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../www/webkit24-gtk3/buildlink3.mk"
-.include "../../wip/deforaos-libdesktop/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/deforaos-surfer/PLIST b/deforaos-surfer/PLIST
deleted file mode 100644
index 683a240e05..0000000000
--- a/deforaos-surfer/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2015/07/13 15:03:22 thomasklausner Exp $
-bin/download
-bin/helper
-bin/surfer
-man/html1/download.html
-man/html1/helper.html
-man/html1/surfer.html
-man/man1/download.1
-man/man1/helper.1
-man/man1/surfer.1
-share/applications/deforaos-helper.desktop
-share/applications/deforaos-surfer.desktop
-share/icons/hicolor/16x16/apps/surfer-view-html-source.png
-share/icons/hicolor/24x24/apps/surfer-view-html-source.png
-share/locale/de/LC_MESSAGES/Surfer.mo
-share/locale/es/LC_MESSAGES/Surfer.mo
-share/locale/fr/LC_MESSAGES/Surfer.mo
-share/locale/it/LC_MESSAGES/Surfer.mo
diff --git a/deforaos-surfer/distinfo b/deforaos-surfer/distinfo
deleted file mode 100644
index 64d14659ef..0000000000
--- a/deforaos-surfer/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.11 2015/08/23 13:26:51 thomasklausner Exp $
-
-SHA1 (Surfer-0.2.7.tar.gz) = 82438f757f7807aa15eab962832d49d355684a76
-RMD160 (Surfer-0.2.7.tar.gz) = dfa041f26752ab570162e99ff1f3d69438324432
-Size (Surfer-0.2.7.tar.gz) = 88108 bytes
-SHA1 (patch-src_Makefile) = c7d56785d6a10f9214ae2fb2526599ab8296fa8d
-SHA1 (patch-src_download.c) = 0c5905a3579262725ee3a1e8abf4896c4d177a48
-SHA1 (patch-tools_Makefile) = 6e73c6bbc1946bc63c6708b8451313c9739cc086
diff --git a/deforaos-surfer/options.mk b/deforaos-surfer/options.mk
deleted file mode 100644
index a426f0aae3..0000000000
--- a/deforaos-surfer/options.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2015/07/13 15:03:22 thomasklausner Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.deforaos-surfer
-PKG_SUPPORTED_OPTIONS= embedded
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+= CPPFLAGS=-DEMBEDDED
-.endif
diff --git a/deforaos-surfer/patches/patch-src_Makefile b/deforaos-surfer/patches/patch-src_Makefile
deleted file mode 100644
index c3e948221a..0000000000
--- a/deforaos-surfer/patches/patch-src_Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.4 2015/07/13 15:03:22 thomasklausner Exp $
-
-Build download(1) with Gtk+ 3.0 for X11
-Build both download(1) and surfer(1) with WebKit for Gtk+ 3.0
-
---- src/Makefile.orig 2015-01-26 22:56:38.000000000 +0000
-+++ src/Makefile
-@@ -23,15 +23,15 @@ subdirs:
- @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
-
- download_OBJS = $(OBJDIR)download.o
--download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0 webkit-1.0`
--download_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0 webkit-1.0` -lintl
-+download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-x11-3.0 webkitgtk-3.0`
-+download_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-x11-3.0 webkitgtk-3.0` -lintl
-
- $(OBJDIR)download: $(download_OBJS)
- $(CC) -o $(OBJDIR)download $(download_OBJS) $(download_LDFLAGS)
-
- surfer_OBJS = $(OBJDIR)surfer.o $(OBJDIR)ghtml.o $(OBJDIR)callbacks.o $(OBJDIR)main.o
--surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop webkit-1.0`
--surfer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop webkit-1.0` -lintl
-+surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop webkitgtk-3.0`
-+surfer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop webkitgtk-3.0` -lintl
-
- $(OBJDIR)surfer: $(surfer_OBJS)
- $(CC) -o $(OBJDIR)surfer $(surfer_OBJS) $(surfer_LDFLAGS)
diff --git a/deforaos-surfer/patches/patch-src_download.c b/deforaos-surfer/patches/patch-src_download.c
deleted file mode 100644
index f0795d6857..0000000000
--- a/deforaos-surfer/patches/patch-src_download.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_download.c,v 1.3 2015/08/23 13:26:51 thomasklausner Exp $
-
-Add missing header for h_errno.
-
---- src/download.c.orig 2014-12-24 17:59:14.000000000 +0000
-+++ src/download.c
-@@ -21,6 +21,7 @@
-
- #include <sys/time.h>
- #include <unistd.h>
-+#include <netdb.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/deforaos-surfer/patches/patch-tools_Makefile b/deforaos-surfer/patches/patch-tools_Makefile
deleted file mode 100644
index c613d5fe7a..0000000000
--- a/deforaos-surfer/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-tools_Makefile,v 1.4 2015/07/13 15:03:22 thomasklausner Exp $
-
-Build helper(1) with Gtk+ 3.0 by default
-
---- tools/Makefile.orig 2015-01-26 22:56:44.000000000 +0000
-+++ tools/Makefile
-@@ -19,8 +19,8 @@ INSTALL = install
- all: $(TARGETS)
-
- helper_OBJS = $(OBJDIR)ghtml-helper.o $(OBJDIR)helper.o
--helper_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags webkit-1.0`
--helper_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs webkit-1.0`
-+helper_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags webkitgtk-3.0`
-+helper_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs webkitgtk-3.0`
-
- $(OBJDIR)helper: $(helper_OBJS)
- $(CC) -o $(OBJDIR)helper $(helper_OBJS) $(helper_LDFLAGS)
Home |
Main Index |
Thread Index |
Old Index