git: 690a8f3a68e8 - main - cleanup: Remove some expired deforaos ports:

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Sun, 18 Jun 2023 19:17:30 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=690a8f3a68e863a224d986ae12ea194d6949925c

commit 690a8f3a68e863a224d986ae12ea194d6949925c
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2023-06-18 18:58:04 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2023-06-18 19:17:24 +0000

    cleanup: Remove some expired deforaos ports:
    
    2023-06-18 x11/deforaos-panel: Broken on all supported versions
    x11/deforaos-desktop: needs expired x11/deforaos-panel
    x11/deforaos-locker: needs expired x11/deforaos-panel
    comms/deforaos-phone: needs expired x11/deforaos-panel
---
 MOVED                                              |  4 +
 comms/Makefile                                     |  1 -
 comms/deforaos-phone/Makefile                      | 63 ---------------
 comms/deforaos-phone/distinfo                      |  3 -
 comms/deforaos-phone/files/patch-doc_Makefile      | 47 -----------
 comms/deforaos-phone/pkg-descr                     |  1 -
 comms/deforaos-phone/pkg-plist                     | 93 ----------------------
 x11/Makefile                                       |  3 -
 x11/deforaos-desktop/Makefile                      | 31 --------
 x11/deforaos-desktop/pkg-descr                     |  1 -
 x11/deforaos-locker/Makefile                       | 57 -------------
 x11/deforaos-locker/distinfo                       |  3 -
 x11/deforaos-locker/files/patch-doc_Makefile       | 34 --------
 x11/deforaos-locker/files/patch-src_Makefile       | 11 ---
 x11/deforaos-locker/pkg-descr                      |  1 -
 x11/deforaos-locker/pkg-plist                      | 22 -----
 x11/deforaos-panel/Makefile                        | 64 ---------------
 x11/deforaos-panel/distinfo                        |  3 -
 x11/deforaos-panel/files/patch-doc-Makefile        | 56 -------------
 .../files/patch-src-applets-bluetooth              | 18 -----
 x11/deforaos-panel/files/patch-src-applets-swap    | 50 ------------
 x11/deforaos-panel/pkg-descr                       |  1 -
 x11/deforaos-panel/pkg-message                     |  9 ---
 x11/deforaos-panel/pkg-plist                       | 76 ------------------
 24 files changed, 4 insertions(+), 648 deletions(-)

diff --git a/MOVED b/MOVED
index 0c7002c92176..de78541930eb 100644
--- a/MOVED
+++ b/MOVED
@@ -7642,3 +7642,7 @@ sysutils/intel-qcu|sysutils/intel-epct|2023-06-14|Moved to sysutils/intel-epct
 multimedia/obs-qtwebkit||2023-06-16|Has expired: OBS ships with their own browser plugin from version 25 onwards
 games/tuxmath||2023-06-16|Has expired: Upstream last release was in 2011
 emulators/skyeye||2023-06-17|Has expired: Upstream last release was in 2014
+x11/deforaos-panel||2023-06-18|Has expired: Broken on all supported versions
+x11/deforaos-desktop||2023-06-18|Removed, needs expired x11/deforaos-panel
+x11/deforaos-locker||2023-06-18|Removed, needs expired x11/deforaos-panel
+comms/deforaos-phone||2023-06-18|Removed, needs expired x11/deforaos-panel
diff --git a/comms/Makefile b/comms/Makefile
index 7f9af8d05b1c..3071b44bc910 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -28,7 +28,6 @@
     SUBDIR += cwstudio
     SUBDIR += cyclonedds
     SUBDIR += dcf77pi
-    SUBDIR += deforaos-phone
     SUBDIR += dfu-programmer
     SUBDIR += dfu-util
     SUBDIR += digiham
diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile
deleted file mode 100644
index e637cb89de44..000000000000
--- a/comms/deforaos-phone/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-PORTNAME=	phone
-PORTVERSION=	0.5.1
-PORTREVISION=	4
-CATEGORIES=	comms
-MASTER_SITES=	http://www.defora.org/os/download/download/4455/
-PKGNAMEPREFIX=	deforaos-
-DISTNAME=	Phone-${PORTVERSION}
-
-MAINTAINER=	olivier@FreeBSD.org
-COMMENT=	DeforaOS telephony application
-WWW=		https://www.defora.org/
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
-		libDesktop.so:x11/deforaos-libdesktop \
-		libpulse.so:audio/pulseaudio \
-		libpurple.so:net-im/libpurple \
-		libsofia-sip-ua.so:net/sofia-sip \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
-BUILD_DEPENDS=	locker:x11/deforaos-locker \
-		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-
-USES=		desktop-file-utils gnome pkgconfig
-USE_GNOME=	gtk20 cairo
-MAKE_ARGS+=	PREFIX=${PREFIX}
-MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
-
-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
-
-post-patch-DOCS-off:
-	${REINPLACE_CMD} 's|data doc include|data include|' \
-		${WRKSRC}/Makefile
-
-post-patch-NLS-off:
-	${REINPLACE_CMD} 's|include po src|include src|' \
-		${WRKSRC}/Makefile
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/dev/modem,/dev/cuaU0,g' \
-		${WRKSRC}/src/modems/hayes.c
-	@${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
-		${WRKSRC}/data/pkgconfig.sh
-	@${REINPLACE_CMD} 's|-Wl,-pie||g' \
-		${WRKSRC}/tools/Makefile \
-		${WRKSRC}/src/Makefile \
-		${WRKSRC}/tests/Makefile
-	@${REINPLACE_CMD} 's|-lossaudio||' \
-		${WRKSRC}/src/plugins/Makefile \
-		${WRKSRC}/tests/Makefile
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Phone/plugins/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Phone/modem/*
-
-.include <bsd.port.mk>
diff --git a/comms/deforaos-phone/distinfo b/comms/deforaos-phone/distinfo
deleted file mode 100644
index 72942936a458..000000000000
--- a/comms/deforaos-phone/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1484259053
-SHA256 (Phone-0.5.1.tar.gz) = 8762b78893725fdc8d2ec31ce2e69e5f0e77dbebc2f3b076f92db64042647e91
-SIZE (Phone-0.5.1.tar.gz) = 327180
diff --git a/comms/deforaos-phone/files/patch-doc_Makefile b/comms/deforaos-phone/files/patch-doc_Makefile
deleted file mode 100644
index 0cf5656ac1af..000000000000
--- a/comms/deforaos-phone/files/patch-doc_Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
---- doc/Makefile.orig	2017-01-12 16:11:40 UTC
-+++ doc/Makefile
-@@ -1,7 +1,7 @@
- MKDIR	= mkdir -m 0755 -p
- INSTALL	= install
- RM	= rm -f
--TARGETS	= $(OBJDIR)gprs.1 $(OBJDIR)gprs.html $(OBJDIR)index.html $(OBJDIR)phone.1 $(OBJDIR)phone.html $(OBJDIR)phonectl.1 $(OBJDIR)phonectl.html
-+TARGETS	= $(OBJDIR)gprs.1 $(OBJDIR)phone.1 $(OBJDIR)phonectl.1
- OBJDIR	=
- PREFIX	= /usr/local
- DESTDIR	=
-@@ -37,23 +37,16 @@ $(OBJDIR)phonectl.html: manual.css.xml p
- clean:
- 	$(RM) -- $(gprs.1_OBJS) $(gprs.html_OBJS) $(index.html_OBJS) $(phone.1_OBJS) $(phone.html_OBJS) $(phonectl.1_OBJS) $(phonectl.html_OBJS)
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gprs.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gprs.html"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)index.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phone.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phone.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phonectl.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phonectl.html"
- 
- distclean: clean
- 	$(RM) -- $(TARGETS)
- 
- install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gprs.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gprs.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phone.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phone.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phonectl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)phonectl.html"
- 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/doc/Phone
- 	$(INSTALL) -m 0644 phone.conf $(DESTDIR)$(PREFIX)/share/doc/Phone/phone.conf
- 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/doc/Phone
-@@ -65,11 +58,8 @@ install: $(TARGETS)
- 
- uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gprs.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gprs.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.html"
- 	$(RM) -- $(DESTDIR)$(PREFIX)/share/doc/Phone/phone.conf
- 	$(RM) -- $(DESTDIR)$(PREFIX)/share/doc/Phone/pppd-chat_gprs
- 	$(RM) -- $(DESTDIR)$(PREFIX)/share/doc/Phone/pppd-peers_gprs
diff --git a/comms/deforaos-phone/pkg-descr b/comms/deforaos-phone/pkg-descr
deleted file mode 100644
index 1f22cb2a0527..000000000000
--- a/comms/deforaos-phone/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-DeforaOS telephony application
diff --git a/comms/deforaos-phone/pkg-plist b/comms/deforaos-phone/pkg-plist
deleted file mode 100644
index 1ca58f72a1ad..000000000000
--- a/comms/deforaos-phone/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-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/plugins/blacklist.so
-lib/Phone/plugins/console.so
-lib/Phone/plugins/debug.so
-lib/Phone/plugins/engineering.so
-lib/Phone/plugins/gprs.so
-lib/Phone/plugins/gps.so
-lib/Phone/plugins/n900.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
-libdata/pkgconfig/Phone.pc
-%%PORTDOCS%%man/man1/gprs.1.gz
-%%PORTDOCS%%man/man1/phone.1.gz
-%%PORTDOCS%%man/man1/phonectl.1.gz
-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/icons/hicolor/16x16/apps/phone-gprs.png
-share/icons/hicolor/16x16/apps/phone-drafts.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-gprs.png
-share/icons/hicolor/24x24/apps/phone-drafts.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/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
-%%NLS%%share/locale/fr/LC_MESSAGES/Phone.mo
-%%NLS%%share/locale/es/LC_MESSAGES/Phone.mo
-%%PORTDOCS%%share/doc/Phone/gprs.conf
-%%PORTDOCS%%share/doc/Phone/phone.conf
-%%PORTDOCS%%share/doc/Phone/pppd-chat_gprs
-%%PORTDOCS%%share/doc/Phone/pppd-peers_gprs
-%%PORTDOCS%%share/doc/Phone/pppd-peers_phone
-%%PORTDOCS%%share/doc/Phone/ussd.conf
diff --git a/x11/Makefile b/x11/Makefile
index 33f19edd1560..829859dce8ad 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -50,11 +50,8 @@
     SUBDIR += controllermap
     SUBDIR += cool-retro-term
     SUBDIR += coreterminal
-    SUBDIR += deforaos-desktop
     SUBDIR += deforaos-keyboard
     SUBDIR += deforaos-libdesktop
-    SUBDIR += deforaos-locker
-    SUBDIR += deforaos-panel
     SUBDIR += deskmenu
     SUBDIR += disman
     SUBDIR += dmenu
diff --git a/x11/deforaos-desktop/Makefile b/x11/deforaos-desktop/Makefile
deleted file mode 100644
index 31c0c7a77e57..000000000000
--- a/x11/deforaos-desktop/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PORTNAME=	desktop
-PORTVERSION=	0.1
-PORTREVISION=	7
-CATEGORIES=	x11
-PKGNAMEPREFIX=	deforaos-
-
-MAINTAINER=	olivier@FreeBSD.org
-COMMENT=	Deforaos distribution metaport
-WWW=		https://www.defora.org/
-
-RUN_DEPENDS=	${LOCALBASE}/bin/keyboard:x11/deforaos-keyboard \
-		${LOCALBASE}/bin/panel:x11/deforaos-panel \
-		${LOCALBASE}/bin/browser:x11-fm/deforaos-browser \
-		${LOCALBASE}/bin/locker:x11/deforaos-locker \
-		${LOCALBASE}/bin/pdfviewer:print/deforaos-pdfviewer \
-		${LOCALBASE}/bin/mailer:mail/deforaos-mailer \
-		${LOCALBASE}/bin/todo:deskutils/deforaos-todo \
-		${LOCALBASE}/bin/player:multimedia/deforaos-player \
-		${LOCALBASE}/bin/editor:editors/deforaos-editor \
-		${LOCALBASE}/bin/phone:comms/deforaos-phone
-
-USES=		metaport
-
-pre-everything::
-	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
-	@${ECHO_MSG} "It won't build and install all the parts until you have typed make install"
-	@${ECHO_MSG} "This port does not ensure things are upgraded; use pkgng/portmaster if you want to"
-	@${ECHO_MSG} "upgrade Defora."
-	@${ECHO_MSG} ""
-
-.include <bsd.port.mk>
diff --git a/x11/deforaos-desktop/pkg-descr b/x11/deforaos-desktop/pkg-descr
deleted file mode 100644
index bc52cb68cbdb..000000000000
--- a/x11/deforaos-desktop/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This metaport installs the entire Deforaos desktop
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
deleted file mode 100644
index fce2a290c649..000000000000
--- a/x11/deforaos-locker/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=	locker
-PORTVERSION=	0.4.0
-PORTREVISION=	1
-CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4424/
-PKGNAMEPREFIX=	deforaos-
-DISTNAME=	Locker-${PORTVERSION}
-
-MAINTAINER=	olivier@FreeBSD.org
-COMMENT=	DeforaOS desktop screensaver
-WWW=		https://www.defora.org/
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
-		libSystem.so:devel/deforaos-libsystem \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
-		libXss.so:x11/libXScrnSaver
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel
-
-USES=		desktop-file-utils gnome pkgconfig xorg
-USE_GNOME=	gtk20 cairo gdkpixbuf2
-USE_XORG=	x11 xext
-MAKE_ARGS+=	PREFIX=${PREFIX}
-MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
-LDFLAGS+=	-lXext
-
-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
-
-post-patch:
-	${REINPLACE_CMD} 's|-Wl,-pie||g' \
-		${WRKSRC}/tests/Makefile \
-		${WRKSRC}/tools/Makefile \
-		${WRKSRC}/src/Makefile
-
-post-patch-DOCS-off:
-	${REINPLACE_CMD} 's|data doc include|data include|' \
-		${WRKSRC}/Makefile
-
-post-patch-NLS-off:
-	${REINPLACE_CMD} 's|include po src|include src|' \
-		${WRKSRC}/Makefile
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
-		${STAGEDIR}${PREFIX}/lib/Locker/auth/* \
-		${STAGEDIR}${PREFIX}/lib/Locker/plugins/* \
-		${STAGEDIR}${PREFIX}/lib/Locker/demos/*
-
-.include <bsd.port.mk>
diff --git a/x11/deforaos-locker/distinfo b/x11/deforaos-locker/distinfo
deleted file mode 100644
index ceb9764b03ce..000000000000
--- a/x11/deforaos-locker/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1483369725
-SHA256 (Locker-0.4.0.tar.gz) = 286aec05034add8b364a33ddc5fed72de7e7aca00d64d1ec686bb628e9e6f3b3
-SIZE (Locker-0.4.0.tar.gz) = 62105
diff --git a/x11/deforaos-locker/files/patch-doc_Makefile b/x11/deforaos-locker/files/patch-doc_Makefile
deleted file mode 100644
index f3a339929ece..000000000000
--- a/x11/deforaos-locker/files/patch-doc_Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- doc/Makefile.orig	2016-02-20 13:12:47 UTC
-+++ doc/Makefile
-@@ -1,4 +1,4 @@
--TARGETS	= $(OBJDIR)index.html $(OBJDIR)locker.1 $(OBJDIR)locker.html $(OBJDIR)lockerctl.1 $(OBJDIR)lockerctl.html
-+TARGETS	= $(OBJDIR)locker.1 $(OBJDIR)lockerctl.1
- OBJDIR	=
- PREFIX	= /usr/local
- DESTDIR	=
-@@ -27,25 +27,18 @@ $(OBJDIR)lockerctl.html: lockerctl.css.x
- 
- clean:
- 	$(RM) -- $(index.html_OBJS) $(locker.1_OBJS) $(locker.html_OBJS) $(lockerctl.1_OBJS) $(lockerctl.html_OBJS)
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)index.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.html"
- 
- distclean: clean
- 	$(RM) -- $(TARGETS)
- 
- install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.html"
- 
- uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.html"
- 
- .PHONY: all clean distclean install uninstall
diff --git a/x11/deforaos-locker/files/patch-src_Makefile b/x11/deforaos-locker/files/patch-src_Makefile
deleted file mode 100644
index 8b2212b335ff..000000000000
--- a/x11/deforaos-locker/files/patch-src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2016-02-20 13:12:47 UTC
-+++ src/Makefile
-@@ -30,7 +30,7 @@ subdirs:
- 
- locker_OBJS = $(OBJDIR)locker.o $(OBJDIR)main.o
- locker_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags x11 xscrnsaver`
--locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11 xscrnsaver`
-+locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lXext `pkg-config --libs x11 xscrnsaver`
- 
- $(OBJDIR)locker$(EXEEXT): $(locker_OBJS)
- 	$(CC) -o $(OBJDIR)locker$(EXEEXT) $(locker_OBJS) $(locker_LDFLAGS)
diff --git a/x11/deforaos-locker/pkg-descr b/x11/deforaos-locker/pkg-descr
deleted file mode 100644
index 66453be290d1..000000000000
--- a/x11/deforaos-locker/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-DeforaOS desktop screensaver
diff --git a/x11/deforaos-locker/pkg-plist b/x11/deforaos-locker/pkg-plist
deleted file mode 100644
index 3c2e562a0821..000000000000
--- a/x11/deforaos-locker/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-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/gtk-demo.so
-lib/Locker/demos/logo.so
-lib/Locker/demos/xscreensaver.so
-lib/Locker/demos/xterm.so
-lib/Locker/plugins/openmoko.so
-lib/Locker/plugins/suspend.so
-lib/Locker/plugins/systray.so
-%%PORTDOCS%%man/man1/locker.1.gz
-%%PORTDOCS%%man/man1/lockerctl.1.gz
-share/applications/deforaos-locker-settings.desktop
-%%NLS%%share/locale/fr/LC_MESSAGES/Locker.mo
-%%NLS%%share/locale/es/LC_MESSAGES/Locker.mo
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
deleted file mode 100644
index a316a0d8d4a0..000000000000
--- a/x11/deforaos-panel/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-PORTNAME=	deforaos-panel
-PORTVERSION=	0.3.6
-PORTREVISION=	2
-CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4417/
-DISTNAME=	Panel-${PORTVERSION}
-
-MAINTAINER=	olivier@FreeBSD.org
-COMMENT=	DeforaOS desktop panel
-WWW=		https://www.defora.org/
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Broken on all supported versions
-EXPIRATION_DATE=	2023-06-18
-BROKEN=	network.c:298:19: error: variable has incomplete type 'struct ifdatareq'
-
-LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
-		libSystem.so:devel/deforaos-libsystem \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
-BUILD_DEPENDS=	browser:x11-fm/deforaos-browser
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
-		sudo:security/sudo
-
-USES=		gnome pkgconfig xorg
-USE_GNOME=	gtk20 cairo
-USE_XORG=	x11
-MAKE_ARGS+=	PREFIX=${PREFIX}
-USE_LDCONFIG=	yes
-
-MAKE_ENV=	MANDIR=${STAGEDIR}${MANPREFIX}/man
-
-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
-
-post-patch-DOCS-off:
-	${REINPLACE_CMD} 's|data doc include|data include|' \
-	${WRKSRC}/Makefile
-
-post-patch-NLS-off:
-	${REINPLACE_CMD} 's|include po src|include src|' \
-		${WRKSRC}/Makefile
-
-post-patch:
-	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
-		${WRKSRC}/data/pkgconfig.sh
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
-		${WRKSRC}/src/panel.c
-	${REINPLACE_CMD} 's|-Wl,-pie||g' \
-		${WRKSRC}/tools/Makefile \
-		${WRKSRC}/src/Makefile \
-		${WRKSRC}/tests/Makefile
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
-		${STAGEDIR}${PREFIX}/lib/Panel/applets/* \
-		${STAGEDIR}${PREFIX}/lib/libPanel.so.0.0
-
-.include <bsd.port.mk>
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
deleted file mode 100644
index 93defbf9f49a..000000000000
--- a/x11/deforaos-panel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1483369528
-SHA256 (Panel-0.3.6.tar.gz) = 00739939fbb14e0df478f026624649eff8cab64a81e067721fa4f75713896241
-SIZE (Panel-0.3.6.tar.gz) = 146129
diff --git a/x11/deforaos-panel/files/patch-doc-Makefile b/x11/deforaos-panel/files/patch-doc-Makefile
deleted file mode 100644
index fd9c9679111c..000000000000
--- a/x11/deforaos-panel/files/patch-doc-Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
---- doc/Makefile.orig	2016-03-01 23:07:41.429960000 +0100
-+++ doc/Makefile	2016-03-01 23:08:45.782008000 +0100
-@@ -1,4 +1,4 @@
--TARGETS	= $(OBJDIR)panel.1 $(OBJDIR)panel.html $(OBJDIR)panelctl.1 $(OBJDIR)panelctl.html $(OBJDIR)panel-embed.1 $(OBJDIR)panel-embed.html $(OBJDIR)panel-message.1 $(OBJDIR)panel-message.html $(OBJDIR)panel-notify.1 $(OBJDIR)panel-notify.html $(OBJDIR)wifibrowser.1 $(OBJDIR)wifibrowser.html
-+TARGETS	= $(OBJDIR)panel.1 $(OBJDIR)panelctl.1 $(OBJDIR)panel-embed.1 $(OBJDIR)panel-message.1 $(OBJDIR)panel-notify.1 $(OBJDIR)wifibrowser.1
- OBJDIR	=
- PREFIX	= /usr/local
- DESTDIR	=
-@@ -49,47 +49,29 @@
- clean:
- 	$(RM) -- $(panel.1_OBJS) $(panel.html_OBJS) $(panelctl.1_OBJS) $(panelctl.html_OBJS) $(panel-embed.1_OBJS) $(panel-embed.html_OBJS) $(panel-message.1_OBJS) $(panel-message.html_OBJS) $(panel-notify.1_OBJS) $(panel-notify.html_OBJS) $(wifibrowser.1_OBJS) $(wifibrowser.html_OBJS)
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panelctl.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panelctl.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-embed.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-embed.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-message.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-message.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-notify.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)panel-notify.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)wifibrowser.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)wifibrowser.html"
- 
- distclean: clean
- 	$(RM) -- $(TARGETS)
- 
- install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panelctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panelctl.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-embed.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-embed.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-message.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-message.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-notify.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)panel-notify.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)wifibrowser.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)wifibrowser.html"
- 
- uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panelctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panelctl.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-embed.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-embed.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-message.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-message.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-notify.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel-notify.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "wifibrowser.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "wifibrowser.html"
- 
- .PHONY: all clean distclean install uninstall
diff --git a/x11/deforaos-panel/files/patch-src-applets-bluetooth b/x11/deforaos-panel/files/patch-src-applets-bluetooth
deleted file mode 100644
index 2763f0d1dbcd..000000000000
--- a/x11/deforaos-panel/files/patch-src-applets-bluetooth
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/applets/bluetooth.c.orig	2016-03-02 00:18:48.529828000 +0100
-+++ src/applets/bluetooth.c	2016-03-02 00:19:04.332171000 +0100
-@@ -21,14 +21,12 @@
- # include <bluetooth.h>
- # include <unistd.h>
- # include <stdio.h>
--# include <string.h>
--# include <errno.h>
- #elif defined(__linux__)
- # include <fcntl.h>
- # include <unistd.h>
-+#endif
- # include <string.h>
- # include <errno.h>
--#endif
- #include <stdlib.h>
- #include <libintl.h>
- #include <System.h>
diff --git a/x11/deforaos-panel/files/patch-src-applets-swap b/x11/deforaos-panel/files/patch-src-applets-swap
deleted file mode 100644
index 7ca2f756909b..000000000000
--- a/x11/deforaos-panel/files/patch-src-applets-swap
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/applets/swap.c.orig	2015-10-24 01:33:21.000000000 +0200
-+++ src/applets/swap.c	2016-03-02 09:10:06.697330000 +0100
-@@ -19,9 +19,15 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--#if defined(__linux__)
-+#if defined(__FreeBSD__)
-+# include <sys/types.h>
-+# include <sys/sysctl.h>
-+# include <sys/vmmeter.h>
-+# include <vm/vm_param.h>
-+#elif defined(__linux__)
- # include <sys/sysinfo.h>
- #elif defined(__NetBSD__)
-+# include <sys/param.h>
- # include <sys/sysctl.h>
- # include <uvm/uvm_extern.h>
- #endif
-@@ -128,7 +134,20 @@
- /* swap_on_timeout */
- static gboolean _swap_on_timeout(gpointer data)
- {
--#if defined(__linux__)
-+#if defined(__FreeBSD__)
-+	Swap * swap = data;
-+	int mib[] = { CTL_VM, VM_TOTAL };
-+	struct vmtotal t;
-+	size_t size = sizeof(t);
-+	gdouble value;
-+
-+	if(sysctl(mib, 2, &t, &size, NULL, 0) < 0)
-+		return TRUE;
-+	value = t.t_rm;
-+	value /= t.t_vm;
-+	_swap_set(swap, value);
-+	return TRUE;
-+#elif defined(__linux__)
- 	Swap * swap = data;
- 	struct sysinfo sy;
- 	gdouble value;
-@@ -157,7 +176,7 @@
- 	Swap * swap = data;
- 
- 	/* FIXME not supported */
--	swap->source = 0;
-+	swap->timeout = 0;
- 	return FALSE;
- #endif
- }
diff --git a/x11/deforaos-panel/pkg-descr b/x11/deforaos-panel/pkg-descr
deleted file mode 100644
index d3671c59f26e..000000000000
--- a/x11/deforaos-panel/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-DeforaOS desktop panel
diff --git a/x11/deforaos-panel/pkg-message b/x11/deforaos-panel/pkg-message
deleted file mode 100644
index 274dae92bbca..000000000000
--- a/x11/deforaos-panel/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Note regarding the suspend feature :
-
-Your user need sudo right for executing /usr/sbin/zzz
-EOM
-}
-]
diff --git a/x11/deforaos-panel/pkg-plist b/x11/deforaos-panel/pkg-plist
deleted file mode 100644
index 782e44e2705d..000000000000
--- a/x11/deforaos-panel/pkg-plist
+++ /dev/null
@@ -1,76 +0,0 @@
-bin/panel
-bin/panel-embed
-bin/panel-message
-bin/panel-notify
-bin/panelctl
-bin/run
-bin/settings
-bin/wifibrowser
-include/Desktop/Panel.h
-include/Desktop/Panel/applet.h
-include/Desktop/Panel/panel.h
-include/Desktop/Panel/window.h
-lib/libPanel.a
-lib/libPanel.so
-lib/libPanel.so.0
-lib/libPanel.so.0.0
-lib/Panel/applets/battery.so
-lib/Panel/applets/brightness.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/memory.so
-lib/Panel/applets/menu.so
-lib/Panel/applets/mixer.so
-lib/Panel/applets/network.so
-lib/Panel/applets/pager.so
-lib/Panel/applets/phone.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
-libdata/pkgconfig/Panel.pc
-%%PORTDOCS%%man/man1/panel-embed.1.gz
-%%PORTDOCS%%man/man1/panel-message.1.gz
-%%PORTDOCS%%man/man1/panel-notify.1.gz
-%%PORTDOCS%%man/man1/panel.1.gz
-%%PORTDOCS%%man/man1/panelctl.1.gz
-%%PORTDOCS%%man/man1/wifibrowser.1.gz
-share/applications/deforaos-panel-settings.desktop
-share/applications/deforaos-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
-%%NLS%%share/locale/fr/LC_MESSAGES/Panel.mo
-%%NLS%%share/locale/es/LC_MESSAGES/Panel.mo