4 files changed, 0 insertions, 194 deletions
diff --git a/sysutils/jfbterm/files/BSDmakefile b/sysutils/jfbterm/files/BSDmakefile
deleted file mode 100644
index a75beeef4bd7..000000000000
--- a/sysutils/jfbterm/files/BSDmakefile
+++ /dev/null
@@ -1,82 +0,0 @@
-PROG = jfbterm
-MAN  = ${PROG}.1 ${PROG}.conf.5
-
-VERSION ?= 0.6.1
-
-ARCH         ?= ${MACHINE_ARCH}
-LOCALBASE    ?= /usr/local
-PREFIX       ?= ${LOCALBASE}
-LIBUTIL      ?= /usr/lib/libutil.a
-LIBARCH      ?= /usr/lib/lib${ARCH}.a
-LIBCHARSET   ?= ${LOCALBASE}/lib/libcharset.a
-LIBICONV     ?= ${LOCALBASE}/lib/libiconv.a
-LIBPNG       ?= ${LOCALBASE}/lib/libpng.a
-GUNZIP       ?= /usr/bin/gunzip
-
-CSTD    ?= gnu89
-CFLAGS  += -DVERSION=\"${VERSION}\"
-CFLAGS  += -DGUNZIP_PATH=\"${GUNZIP}\"
-CFLAGS  += -DSYSCONFDIR=\"${PREFIX}/etc\"
-LDFLAGS += -L${LOCALBASE}/lib
-LDADD   += ${DPADD:C|.*/lib(.*)\.a$|-l\1|}
-DPADD   += ${LIBUTIL}
-
-CFLAGS += -DENABLE_8BPP
-CFLAGS += -DENABLE_15BPP
-CFLAGS += -DENABLE_16BPP
-CFLAGS += -DENABLE_24BPP
-CFLAGS += -DENABLE_32BPP
-CFLAGS += -DENABLE_SPLASH_SCREEN
-CFLAGS += -DENABLE_256_COLOR
-
-SRCS  =	main.c console.c framebuffer.c memctl.c accessor.c palette.c \
-	eastasianwidth.c font.c picofont.c getcap.c pcf.c pen.c term.c \
-	utilities.c privilege.c csv.c vterm.c vtermlow.c cursor.c \
-	splash-bmp.c splash-png.c splash.c bell.c screensaver.c mouse.c \
-	clipboard.c keyboard.c
-
-.if !defined(OPSYS)
-OPSYS != uname -s
-.endif
-
-.if ${ARCH:Mamd64} || ${ARCH:Mx86_64} || ${ARCH:Mi386}
-. if ${OPSYS:MLinux} || ${OPSYS:MFreeBSD}
-CFLAGS += -DENABLE_VGA16FB
-. elif ${OPSYS:MNetBSD}
-DPADD += ${LIBARCH}
-. endif
-.endif
-
-.if exists(/usr/include/iconv.h) && ${OPSYS:MFreeBSD}
-CFLAGS  += -DLIBICONV_PLUG
-CFLAGS  += -nostdinc
-CFLAGS  += -isystem/usr/include
-.endif
-CFLAGS  += -isystem${LOCALBASE}/include
-
-.if exists(/usr/include/utmp.h)
-CFLAGS += -DHAVE_UTMP_H
-.endif
-
-.if defined(WITH_DEBUG)
-DEBUG_FLAGS ?= -g
-CFLAGS      += -DDEBUG
-CFLAGS      += -DPCF_DEBUG
-.endif
-
-.if !defined(WITHOUT_ICONV)
-CFLAGS  += -DENABLE_UTF8
-CFLAGS  += -DENABLE_OTHER_CODING_SYSTEM
-. if !${CFLAGS:M-DLIBICONV_PLUG} && ${OPSYS:MFreeBSD}
-DPADD   += ${LIBICONV} ${LIBCHARSET}
-. endif
-.endif
-
-.if !defined(WITHOUT_PNG)
-CFLAGS  += -DWITH_LIBPNG
-DPADD   += ${LIBPNG}
-DPADD   += ${LIBM}
-DPADD   += ${LIBZ}
-.endif
-
-.include <bsd.prog.mk>
diff --git a/sysutils/jfbterm/files/patch-mtrr b/sysutils/jfbterm/files/patch-mtrr
deleted file mode 100644
index 021779861809..000000000000
--- a/sysutils/jfbterm/files/patch-mtrr
+++ /dev/null
@@ -1,90 +0,0 @@
---- framebuffer.c.orig	2009-02-23 18:23:54.000000000 -0500
-+++ framebuffer.c	2010-02-22 19:26:38.000000000 -0500
-@@ -442,6 +442,11 @@
- 	assert(initialized);
- 
- 	if (self->memory != MAP_FAILED) {
-+		if (writecombine.enable) {
-+			memctl_clearWriteCombine(writecombine.base,
-+			    writecombine.size);
-+			writecombine.enable = false;
-+		}
- 		if (munmap(self->memory, self->length) == -1)
- 			warn("munmap()");
- 		self->memory = MAP_FAILED;
-@@ -1162,18 +1167,21 @@
- 			warnx("Invalid write-combining base detected. "
- 			      "Start of framebuffer memory is %#x.",
- 			      video_adapter_info.va_window);
--		writecombine.base = video_adapter_info.va_window;
-+		writecombine.base = (u_long)video_adapter_info.va_window;
- 		if (writecombine.size != 0 &&
- 		    video_adapter_info.va_window_size != writecombine.size)
- 			warnx("Invalid write-combining size detected. "
- 			      "Framebuffer size is %#x.",
- 			      video_adapter_info.va_window_size);
- 		writecombine.size = video_adapter_info.va_window_size;
-+		writecombine.size = powerof2(writecombine.size) ?
-+		    writecombine.size : 1UL << flsl(writecombine.size);
- #endif
--		if (writecombine.base != 0 && writecombine.size != 0)
--			memctl_setWriteCombine(writecombine.base,
--					       writecombine.size);
-+		if (writecombine.base == 0 || writecombine.size == 0)
-+			writecombine.enable = false;
- 	}
-+	if (writecombine.enable)
-+		memctl_setWriteCombine(writecombine.base, writecombine.size);
- 
- 	/* VGA */
- #ifdef ENABLE_VGA16FB
---- memctl.c.orig	2009-01-23 10:53:36.000000000 -0500
-+++ memctl.c	2010-02-22 19:26:38.000000000 -0500
-@@ -92,7 +92,7 @@
- 		mem_range_desc.mr_owner[sizeof(mem_range_desc.mr_owner) - 1] =
- 			'\0';
- 		mem_range_op.mo_desc   = &mem_range_desc;
--		mem_range_op.mo_arg[0] = 0;
-+		mem_range_op.mo_arg[0] = MEMRANGE_SET_UPDATE;
- 		if (ioctl(fd, MEMRANGE_SET, &mem_range_op) != -1)
- 			result = true;
- 		close(fd);
-@@ -130,3 +130,28 @@
- #endif
- }
- 
-+void memctl_clearWriteCombine(unsigned long base, unsigned long size)
-+{
-+#if defined (__FreeBSD__) && (defined (__amd64__) || defined (__i386__))
-+	struct mem_range_desc mem_range_desc;
-+	struct mem_range_op mem_range_op;
-+	int fd;
-+
-+	assert(base != 0);
-+	assert(size != 0);
-+
-+	privilege_on();
-+	fd = open(_PATH_MEM, O_RDONLY);
-+	privilege_off();
-+	if (fd != -1) {
-+		mem_range_desc.mr_base = base;
-+		mem_range_desc.mr_len  = size;
-+		mem_range_op.mo_desc   = &mem_range_desc;
-+		mem_range_op.mo_arg[0] = MEMRANGE_SET_REMOVE;
-+		if (ioctl(fd, MEMRANGE_SET, &mem_range_op) == -1)
-+			warn("failed to clear mtrr (0x%lx/0x%lx)\n",
-+			    base, size);
-+		close(fd);
-+	}
-+#endif
-+}
---- memctl.h.orig	2009-01-23 10:53:36.000000000 -0500
-+++ memctl.h	2010-02-22 19:26:38.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <stdbool.h>
- 
- bool memctl_setWriteCombine(unsigned long base, unsigned long size);
-+void memctl_clearWriteCombine(unsigned long base, unsigned long size);
- 
- #endif /* INCLUDE_MEMCTL_H */
- 
diff --git a/sysutils/jfbterm/files/patch-screensaver.c b/sysutils/jfbterm/files/patch-screensaver.c
deleted file mode 100644
index eeadf40f0393..000000000000
--- a/sysutils/jfbterm/files/patch-screensaver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- screensaver.c~
-+++ screensaver.c
-@@ -61,7 +61,7 @@
- #define UNBLANK (V_DISPLAY_ON)
- #elif defined (__NetBSD__) || defined (__OpenBSD__)
- #define UNBLANK (WSDISPLAYIO_VIDEO_ON)
--#elif
-+#else
- 	#error not implement
- #endif
- 
diff --git a/sysutils/jfbterm/files/patch-splash-png.c b/sysutils/jfbterm/files/patch-splash-png.c
deleted file mode 100644
index 0675d74cafe6..000000000000
--- a/sysutils/jfbterm/files/patch-splash-png.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- splash-png.c~
-+++ splash-png.c
-@@ -103,7 +103,7 @@ u_char *read_png_file(FILE *stream, u_in
- 	if (color_type == PNG_COLOR_TYPE_PALETTE)
- 		png_set_palette_to_rgb(png_ptr);
- 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
- 		png_set_tRNS_to_alpha(png_ptr);
- 	if (bit_depth == 16)