[Midnightbsd-cvs] mports [24201] trunk/x11-servers: add xwayland and Xfstt.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Sep 4 21:11:44 EDT 2018


Revision: 24201
          http://svnweb.midnightbsd.org/mports/?rev=24201
Author:   laffer1
Date:     2018-09-04 21:11:43 -0400 (Tue, 04 Sep 2018)
Log Message:
-----------
add xwayland and Xfstt.  remove mga_hal

Modified Paths:
--------------
    trunk/x11-servers/Makefile

Added Paths:
-----------
    trunk/x11-servers/Xfstt/
    trunk/x11-servers/Xfstt/Makefile
    trunk/x11-servers/Xfstt/distinfo
    trunk/x11-servers/Xfstt/files/
    trunk/x11-servers/Xfstt/files/patch-INSTALL
    trunk/x11-servers/Xfstt/files/patch-doc__Makefile.in
    trunk/x11-servers/Xfstt/files/patch-libfstt__arch.h
    trunk/x11-servers/Xfstt/files/patch-po_Makefile.in.in
    trunk/x11-servers/Xfstt/files/patch-src__Makefile.in
    trunk/x11-servers/Xfstt/files/pkg-message.in
    trunk/x11-servers/Xfstt/files/xfstt.in
    trunk/x11-servers/Xfstt/pkg-descr
    trunk/x11-servers/Xfstt/pkg-plist
    trunk/x11-servers/xwayland/
    trunk/x11-servers/xwayland/Makefile
    trunk/x11-servers/xwayland/distinfo
    trunk/x11-servers/xwayland/pkg-descr

Removed Paths:
-------------
    trunk/x11-servers/mga_hal/

Modified: trunk/x11-servers/Makefile
===================================================================
--- trunk/x11-servers/Makefile	2018-09-05 01:06:16 UTC (rev 24200)
+++ trunk/x11-servers/Makefile	2018-09-05 01:11:43 UTC (rev 24201)
@@ -2,7 +2,7 @@
 
 COMMENT = X11 servers
 
-SUBDIR += mga_hal
+SUBDIR += Xfstt
 SUBDIR += x2vnc
 SUBDIR += x2x
 SUBDIR += xephyr
@@ -10,5 +10,6 @@
 SUBDIR += xorg-nestserver
 SUBDIR += xorg-server
 SUBDIR += xorg-vfbserver
+SUBDIR += xwayland
 
 .include <bsd.port.subdir.mk>

Added: trunk/x11-servers/Xfstt/Makefile
===================================================================
--- trunk/x11-servers/Xfstt/Makefile	                        (rev 0)
+++ trunk/x11-servers/Xfstt/Makefile	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,42 @@
+# $MidnightBSD$
+
+PORTNAME=	xfstt
+PORTVERSION=	1.9.2
+CATEGORIES=	x11-servers
+MASTER_SITES=	http://archive.hadrons.org/software/xfstt/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	TrueType font server for X11
+
+LICENSE=	lgpl
+LICENSE_FILE=	${WRKSRC}/COPYING.LIB
+
+USES=		pkgconfig tar:xz
+USE_XORG=	fontsproto xproto
+USE_RC_SUBR=	xfstt
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=/var --disable-nls
+
+TTFONTDIR=	${PREFIX}/share/fonts/TrueType
+
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+.for file in INSTALL doc/Makefile.in src/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%TTFONTDIR%%|${TTFONTDIR}|g' ${WRKSRC}/${file}
+.endfor
+
+post-install:
+	${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.in \
+		> ${WRKSRC}/xfstt
+	${INSTALL_SCRIPT} ${WRKSRC}/xfstt ${STAGEDIR}${PREFIX}/etc/rc.d/
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for _file in INSTALL THANKS
+	${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}
+.endfor
+
+.include <bsd.port.mk>


Property changes on: trunk/x11-servers/Xfstt/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/distinfo
===================================================================
--- trunk/x11-servers/Xfstt/distinfo	                        (rev 0)
+++ trunk/x11-servers/Xfstt/distinfo	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,2 @@
+SHA256 (xfstt-1.9.2.tar.xz) = 798a0071719ef302b67abd04652dae9bbe8ae9b9dc497fc6d3360fca7eded46d
+SIZE (xfstt-1.9.2.tar.xz) = 213816


Property changes on: trunk/x11-servers/Xfstt/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/patch-INSTALL
===================================================================
--- trunk/x11-servers/Xfstt/files/patch-INSTALL	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/patch-INSTALL	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,11 @@
+--- INSTALL.orig	2012-03-02 15:33:23 UTC
++++ INSTALL
+@@ -41,7 +41,7 @@ Distributed tar Sources
+    (use gmake instead of the standard make on FreeBSD)
+ 
+ 3) Copy some truetype (.ttf) files or create symlinks to truetype directories
+-   in the default installation directory /usr/local/share/fonts/truetype
++   in the default installation directory %%TTFONTDIR%%
+    (note that this directory may be changed in the configure step). Then to
+    generate the font databases:
+ 


Property changes on: trunk/x11-servers/Xfstt/files/patch-INSTALL
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/patch-doc__Makefile.in
===================================================================
--- trunk/x11-servers/Xfstt/files/patch-doc__Makefile.in	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/patch-doc__Makefile.in	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	2015-08-11 01:51:59 UTC
++++ doc/Makefile.in
+@@ -289,8 +289,8 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-fontdir = $(datadir)/fonts/truetype
+-cachedir = $(localstatedir)/cache/xfstt
++fontdir = %%TTFONTDIR%%
++cachedir = %%TTFONTDIR%%
+ pidfile = $(localstatedir)/run/xfstt.pid
+ man_MANS = xfstt.1x
+ EXTRA_DIST = xfstt.1x.in FAQ examples


Property changes on: trunk/x11-servers/Xfstt/files/patch-doc__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/patch-libfstt__arch.h
===================================================================
--- trunk/x11-servers/Xfstt/files/patch-libfstt__arch.h	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/patch-libfstt__arch.h	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,10 @@
+--- libfstt/arch.h.orig	2012-03-02 15:33:23 UTC
++++ libfstt/arch.h
+@@ -48,6 +48,7 @@
+ 
+ // architecture specific
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ 
+ // byte swapping (doing it by ntohl/ntohs works only on little endian CPUs)


Property changes on: trunk/x11-servers/Xfstt/files/patch-libfstt__arch.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/patch-po_Makefile.in.in
===================================================================
--- trunk/x11-servers/Xfstt/files/patch-po_Makefile.in.in	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/patch-po_Makefile.in.in	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	2015-08-11 01:51:51 UTC
++++ po/Makefile.in.in
+@@ -80,6 +80,7 @@ CATALOGS = @CATALOGS@
+ POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+ POFILESDEPS_yes = $(POFILESDEPS_)
+ POFILESDEPS_no =
++PO_DEPENDS_ON_POT =
+ POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+ 
+ DISTFILESDEPS_ = update-po


Property changes on: trunk/x11-servers/Xfstt/files/patch-po_Makefile.in.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/patch-src__Makefile.in
===================================================================
--- trunk/x11-servers/Xfstt/files/patch-src__Makefile.in	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/patch-src__Makefile.in	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,13 @@
+--- src/Makefile.in.orig	2015-08-11 01:51:59 UTC
++++ src/Makefile.in
+@@ -341,8 +341,8 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-fontdir = $(datadir)/fonts/truetype
+-cachedir = $(localstatedir)/cache/xfstt
++fontdir = %%TTFONTDIR%%
++cachedir = %%TTFONTDIR%%
+ pidfile = $(localstatedir)/run/xfstt.pid
+ LDADD = @LIBINTL@ -L$(top_builddir)/libfstt -lfstt
+ AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)\"" -DFONTDIR=\""$(fontdir)\"" \


Property changes on: trunk/x11-servers/Xfstt/files/patch-src__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/pkg-message.in
===================================================================
--- trunk/x11-servers/Xfstt/files/pkg-message.in	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/pkg-message.in	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,13 @@
+******************************************************************
+You will have to install your TrueType fonts in
+
+	%%PREFIX%%/share/fonts/TrueType
+
+Remember to run the "xfstt --sync" command if you
+add fonts while the font server is running.
+
+You should also add the following line to the "Files"
+section of your xorg.conf file:
+
+	FontPath   "unix/:7101"
+******************************************************************


Property changes on: trunk/x11-servers/Xfstt/files/pkg-message.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/files/xfstt.in
===================================================================
--- trunk/x11-servers/Xfstt/files/xfstt.in	                        (rev 0)
+++ trunk/x11-servers/Xfstt/files/xfstt.in	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# PROVIDE: xfstt
+# REQUIRE: login
+# KEYWORD: shutdown
+
+PREFIX=%%PREFIX%%
+
+case "$1" in
+
+start)
+	${PREFIX}/bin/xfstt --sync >/dev/null
+	${PREFIX}/bin/xfstt --user nobody --notcp --daemon && echo -n ' xfstt'
+	;;
+stop)
+	/usr/bin/killall xfstt 2>/dev/null && echo -n ' xfstt'
+	;;
+*)
+	echo "$0 start | stop"
+	;;
+
+esac


Property changes on: trunk/x11-servers/Xfstt/files/xfstt.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/pkg-descr
===================================================================
--- trunk/x11-servers/Xfstt/pkg-descr	                        (rev 0)
+++ trunk/x11-servers/Xfstt/pkg-descr	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,3 @@
+This is Xfstt, a free TrueType font server for X11.
+
+WWW: http://www.hadrons.org/software/xfstt/


Property changes on: trunk/x11-servers/Xfstt/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/Xfstt/pkg-plist
===================================================================
--- trunk/x11-servers/Xfstt/pkg-plist	                        (rev 0)
+++ trunk/x11-servers/Xfstt/pkg-plist	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,5 @@
+bin/xfstt
+man/man1/xfstt.1x.gz
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+ at dir share/fonts/TrueType


Property changes on: trunk/x11-servers/Xfstt/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/xwayland/Makefile
===================================================================
--- trunk/x11-servers/xwayland/Makefile	                        (rev 0)
+++ trunk/x11-servers/xwayland/Makefile	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,46 @@
+# $MidnightBSD$
+# $FreeBSD: head/x11-servers/xwayland/Makefile 452247 2017-10-16 19:45:15Z rezny $
+
+PORTNAME=	xwayland
+PORTVERSION=	1.19.1
+
+COMMENT=	X Clients under Wayland
+
+LICENSE=	mit
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols
+LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
+		libinput.so:x11/libinput
+
+MASTERDIR=	${.CURDIR}/../xorg-server
+DESCR=		${.CURDIR}/pkg-descr
+DISTINFO_FILE=	${.CURDIR}/distinfo
+PATCHDIR=	${.CURDIR}/files
+
+SLAVE_PORT=	yes
+OPTIONS_EXCLUDE=DEVD HAL SUID
+
+USE_XORG=	x11 xext xfont2
+USE_GL+=	egl gbm
+
+CONFIGURE_ARGS+=	--disable-docs --disable-devel-docs \
+			--enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \
+			--disable-xquartz --disable-xwin
+
+PLIST_FILES=	bin/Xwayland
+
+EXTRA_PATCHES=	${MASTERDIR}/files/patch-CVE-2017-12176 \
+		${MASTERDIR}/files/patch-CVE-2017-12177 \
+		${MASTERDIR}/files/patch-CVE-2017-12178 \
+		${MASTERDIR}/files/patch-CVE-2017-12179 \
+		${MASTERDIR}/files/patch-CVE-2017-12183 \
+		${MASTERDIR}/files/patch-CVE-2017-1218x \
+		${MASTERDIR}/files/patch-CVE-2017-1218y \
+		${MASTERDIR}/files/patch-CVE-2017-13721 \
+		${MASTERDIR}/files/patch-CVE-2017-13723 \
+		${MASTERDIR}/files/patch-os_io.c
+
+do-install:
+	cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} ${FAKE_MAKEARGS} install
+
+.include "${MASTERDIR}/Makefile"


Property changes on: trunk/x11-servers/xwayland/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/xwayland/distinfo
===================================================================
--- trunk/x11-servers/xwayland/distinfo	                        (rev 0)
+++ trunk/x11-servers/xwayland/distinfo	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1484388904
+SHA256 (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb
+SIZE (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 6041792


Property changes on: trunk/x11-servers/xwayland/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11-servers/xwayland/pkg-descr
===================================================================
--- trunk/x11-servers/xwayland/pkg-descr	                        (rev 0)
+++ trunk/x11-servers/xwayland/pkg-descr	2018-09-05 01:11:43 UTC (rev 24201)
@@ -0,0 +1,4 @@
+XWayland is an X Server running as a Wayland client, thus capable of displaying
+native X11 client applications in a Wayland compositor environment.
+
+WWW: https://wayland.freedesktop.org/xserver.html


Property changes on: trunk/x11-servers/xwayland/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list