From swell.k@gmail.com  Thu Sep 24 10:22:18 2009
Return-Path: <swell.k@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B6F5C106568B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Sep 2009 10:22:18 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.26])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A6248FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Sep 2009 10:22:17 +0000 (UTC)
Received: by ey-out-2122.google.com with SMTP id 4so347132eyf.9
        for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Sep 2009 03:22:17 -0700 (PDT)
Received: by 10.210.96.23 with SMTP id t23mr7317299ebb.11.1253787737046;
        Thu, 24 Sep 2009 03:22:17 -0700 (PDT)
Received: from localhost (95-24-211-3.broadband.corbina.ru [95.24.211.3])
        by mx.google.com with ESMTPS id 5sm1571284eyh.25.2009.09.24.03.22.15
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Thu, 24 Sep 2009 03:22:16 -0700 (PDT)
Message-Id: <861vlwej9e.fsf@gmail.com>
Date: Thu, 24 Sep 2009 14:20:45 +0400
From: Anonymous <swell.k@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] sysutils/jfbterm: convert to bsdmake
X-Send-Pr-Version: 3.113

>Number:         139107
>Category:       ports
>Synopsis:       [patch] sysutils/jfbterm: convert to bsdmake
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 24 10:30:07 UTC 2009
>Closed-Date:    Tue Sep 14 07:12:58 UTC 2010
>Last-Modified:  Wed Sep 22 05:50:01 UTC 2010
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD 9.0-CURRENT #1 r197441M: Wed Sep 23 18:56:05 UTC 2009     root@luffy:/usr/obj/usr/src/sys/PHOENIX  amd64
>Description:
Dispose of autotools[1]. While here fix these bugs:
- GCC 4.4+ build (#elif with no expression)
- use ENABLE_VGA16FB on amd64 (configure-script expects x86_64)

and
- move libiconv, libpng and gnu-unifont to respective options.
  All ON by default. With all options unset = empty all-depends-list.

Requested by:	paradox <ddkprog@yahoo.com>

[1] This should reduce build time and lessen dependencies with little
    cost of maintaining more clear BSDmakefile and config.h that
    were based on Makefile.am, configure.in and config.h.in.
>How-To-Repeat:
>Fix:
--- jfbterm.diff begins here ---
Index: sysutils/jfbterm/Makefile
===================================================================
RCS file: /home/csup/ports/sysutils/jfbterm/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- sysutils/jfbterm/Makefile	1 Mar 2009 19:38:06 -0000	1.8
+++ sysutils/jfbterm/Makefile	24 Sep 2009 10:12:45 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	jfbterm
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ac.auone-net.jp/~baba/jfbterm/ \
 		http://chirashi-no-ura.net/files/
@@ -14,24 +15,45 @@ DISTNAME=	${PORTNAME}-FreeBSD-${PORTVERS
 MAINTAINER=	bsdports@gmail.com
 COMMENT=	Multilanguage can be displayed on the console
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
-
-USE_ICONV=	yes
-USE_GNOME=	pkgconfig
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 automake:14
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		--mandir="${LOCALBASE}/man"
+MAKEFILE=	BSDmakefile
 
 MAN1=	jfbterm.1
 MAN5=	jfbterm.conf.5
 
+OPTIONS=	ICONV	"encodings support"		On \
+		PNG	"splash support"		On \
+		UNIFONT	"install pan-unicode font"	On
+
+.include <bsd.port.pre.mk>
+
+.if !defined(NOMANCOMPRESS)
+MANCOMPRESSED=	yes
+.endif
+
+.if !defined(WITHOUT_ICONV)
+USE_ICONV=	yes
+.else
+MAKE_ENV+=	WITHOUT_ICONV=
+.endif
+
+.if !defined(WITHOUT_PNG)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+.else
+MAKE_ENV+=	WITHOUT_PNG=
+.endif
+
+.if !defined(WITHOUT_UNIFONT)
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+.endif
+
+post-extract:	.SILENT
+.for f in BSDmakefile config.h
+	${CP} ${FILESDIR}/${f} ${WRKSRC}
+.endfor
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sysutils/jfbterm/pkg-plist
===================================================================
RCS file: /home/csup/ports/sysutils/jfbterm/pkg-plist,v
retrieving revision 1.1
diff -u -p -r1.1 pkg-plist
--- sysutils/jfbterm/pkg-plist	19 Mar 2008 06:43:16 -0000	1.1
+++ sysutils/jfbterm/pkg-plist	24 Sep 2009 07:35:11 -0000
@@ -1,7 +1,7 @@
 bin/jfbterm
 etc/jfbterm.conf.sample
-%%DATADIR%%/fonts/vt100-graphics.pcf.gz
-%%DATADIR%%/termcap.jfbterm
-%%DATADIR%%/terminfo.jfbterm
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%
+%%PORTDATA%%%%DATADIR%%/fonts/vt100-graphics.pcf.gz
+%%PORTDATA%%%%DATADIR%%/termcap.jfbterm
+%%PORTDATA%%%%DATADIR%%/terminfo.jfbterm
+%%PORTDATA%%@dirrm %%DATADIR%%/fonts
+%%PORTDATA%%@dirrm %%DATADIR%%
Index: sysutils/jfbterm/files/BSDmakefile
===================================================================
RCS file: sysutils/jfbterm/files/BSDmakefile
diff -N sysutils/jfbterm/files/BSDmakefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/jfbterm/files/BSDmakefile	24 Sep 2009 10:15:33 -0000
@@ -0,0 +1,61 @@
+PROG = jfbterm
+MAN  = ${PROG}.1 ${PROG}.conf.5
+
+ARCH         ?= ${MACHINE_ARCH}
+LOCALBASE    ?= /usr/local
+PREFIX       ?= /usr/local
+BINDIR       ?= ${PREFIX}/bin
+MANDIR       ?= ${PREFIX}/man/man
+DATADIR      ?= ${PREFIX}/share/${PROG}
+INSTALL_DIR  ?= ${INSTALL} -d
+INSTALL_DATA ?= ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
+
+CSTD   ?= gnu89
+CFLAGS += -I${LOCALBASE}/include
+CFLAGS += -DHAVE_CONFIG_H
+CFLAGS += -DSYSCONFDIR=\"${PREFIX}/etc\"
+LDADD  += -lutil
+
+.if ${ARCH:Mamd64} || ${ARCH:Mi386}
+CFLAGS += -DENABLE_VGA16FB
+.endif
+
+.if defined(WITH_DEBUG)
+CFLAGS += -DDEBUG
+CFLAGS += -DPCF_DEBUG
+.endif
+
+.if !defined(WITHOUT_ICONV)
+CFLAGS += -DENABLE_UTF8
+CFLAGS += -DENABLE_OTHER_CODING_SYSTEM
+LDADD  += -L${LOCALBASE}/lib
+LDADD  += -liconv
+.endif
+
+.if !defined(WITHOUT_PNG)
+CFLAGS += -DWITH_LIBPNG
+LDADD  += -L${LOCALBASE}/lib
+LDADD  += -lpng
+.endif
+
+.if !defined(WITHOUT_SETUID)
+BINMODE = 4555
+.endif
+
+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
+
+afterinstall:
+	${INSTALL_DATA} jfbterm.conf.sample.FreeBSD \
+		${PREFIX}/etc/${PROG}.conf.sample
+.if !defined(NOPORTDATA)
+	${INSTALL_DIR} ${DATADIR}/fonts
+	${INSTALL_DATA} fonts/*.pcf.gz ${DATADIR}/fonts
+	${INSTALL_DATA} termcap.jfbterm ${DATADIR}
+	${INSTALL_DATA} terminfo.jfbterm ${DATADIR}
+.endif
+
+.include <bsd.prog.mk>
Index: sysutils/jfbterm/files/config.h
===================================================================
RCS file: sysutils/jfbterm/files/config.h
diff -N sysutils/jfbterm/files/config.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/jfbterm/files/config.h	24 Sep 2009 08:32:40 -0000
@@ -0,0 +1,9 @@
+#define VERSION "0.6.0"
+#define GUNZIP_PATH "/usr/bin/gunzip"
+#define ENABLE_8BPP 1
+#define ENABLE_15BPP 1
+#define ENABLE_16BPP 1
+#define ENABLE_24BPP 1
+#define ENABLE_32BPP 1
+#define ENABLE_SPLASH_SCREEN 1
+#define ENABLE_256_COLOR 1
Index: sysutils/jfbterm/files/patch-screensaver.c
===================================================================
RCS file: sysutils/jfbterm/files/patch-screensaver.c
diff -N sysutils/jfbterm/files/patch-screensaver.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/jfbterm/files/patch-screensaver.c	24 Sep 2009 08:42:21 -0000
@@ -0,0 +1,11 @@
+--- 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
+ 
--- jfbterm.diff ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Sep 24 10:30:19 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139107 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: bsdports@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Thu, 24 Sep 2009 10:30:16 UT

 Maintainer of sysutils/jfbterm,
 
 Please note that PR ports/139107 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/139107
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Wed, 30 Sep 2009 22:52:56 +0400

 Here is a slightly udpated diff.
 
 - fix PNG option description
 - fix WITH_DEBUG so the binary isn't stripped when DEBUG_FLAGS
   is not defined. Found when tried to debug crash on terminus-font with
   FONT_HALF_UNI.
 - honor NOMAN, NOSHARED. Warnings from bsd.compat.mk can be safely ignored.
 - copy jfbterm.conf.sample to jfbterm.conf if it doesn't exist.
 
 --- jfbterm.diff begins here ---
  Makefile                  |   57 +++++++++++++++++++++++++++---------
  files/BSDmakefile         |   71 ++++++++++++++++++++++++++++++++++++++++++++++
  files/config.h            |    9 +++++
  files/patch-screensaver.c |   11 +++++++
  pkg-plist                 |   12 ++++---
  5 files changed, 141 insertions(+), 19 deletions(-)
 
 Index: sysutils/jfbterm/Makefile
 ===================================================================
 RCS file: /home/csup/ports/sysutils/jfbterm/Makefile,v
 retrieving revision 1.8
 diff -u -p -r1.8 Makefile
 --- sysutils/jfbterm/Makefile	1 Mar 2009 19:38:06 -0000	1.8
 +++ sysutils/jfbterm/Makefile	30 Sep 2009 18:36:52 -0000
 @@ -6,6 +6,7 @@
  
  PORTNAME=	jfbterm
  PORTVERSION=	0.6.0
 +PORTREVISION=	1
  CATEGORIES=	sysutils
  MASTER_SITES=	http://www.ac.auone-net.jp/~baba/jfbterm/ \
  		http://chirashi-no-ura.net/files/
 @@ -14,24 +15,52 @@ DISTNAME=	${PORTNAME}-FreeBSD-${PORTVERS
  MAINTAINER=	bsdports@gmail.com
  COMMENT=	Multilanguage can be displayed on the console
  
 -LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 -RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 -
 -USE_ICONV=	yes
 -USE_GNOME=	pkgconfig
  PKGMESSAGE=	${WRKDIR}/pkg-message
  SUB_FILES=	pkg-message
 -USE_GMAKE=	yes
 -GNU_CONFIGURE=	yes
 -USE_AUTOTOOLS=	autoconf:262 automake:14
 -CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 -		LDFLAGS="-L${LOCALBASE}/lib" \
 -		--mandir="${LOCALBASE}/man"
 +MAKEFILE=	BSDmakefile
 +
 +OPTIONS=	ICONV	"encodings support"		On \
 +		PNG	"splash .png support"		On \
 +		UNIFONT	"install pan-unicode font"	On
  
 +.include <bsd.port.pre.mk>
 +
 +.if !defined(NOMAN)
  MAN1=	jfbterm.1
  MAN5=	jfbterm.conf.5
 +.endif
 +
 +.if !defined(NOMANCOMPRESS)
 +MANCOMPRESSED=	yes
 +.endif
  
 -post-install:
 -	@${CAT} ${PKGMESSAGE}
 +.if !defined(WITHOUT_ICONV)
 +USE_ICONV=	yes
 +.else
 +MAKE_ENV+=	WITHOUT_ICONV=
 +.endif
 +
 +.if !defined(WITHOUT_PNG)
 +LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 +.else
 +MAKE_ENV+=	WITHOUT_PNG=
 +.endif
 +
 +.if !defined(WITHOUT_UNIFONT)
 +RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 +.endif
 +
 +post-extract:	.SILENT
 +	${MKDIR} ${WRKSRC}/obj
 +.for f in BSDmakefile config.h
 +	${CP} ${FILESDIR}/${f} ${WRKSRC}
 +.endfor
 +
 +post-install:	.SILENT
 +	if  [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/${PORTNAME}.conf.sample \
 +			${PREFIX}/etc/${PORTNAME}.conf; \
 +	fi
 +	${CAT} ${PKGMESSAGE}
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: sysutils/jfbterm/pkg-plist
 ===================================================================
 RCS file: /home/csup/ports/sysutils/jfbterm/pkg-plist,v
 retrieving revision 1.1
 diff -u -p -r1.1 pkg-plist
 --- sysutils/jfbterm/pkg-plist	19 Mar 2008 06:43:16 -0000	1.1
 +++ sysutils/jfbterm/pkg-plist	30 Sep 2009 18:17:47 -0000
 @@ -1,7 +1,9 @@
  bin/jfbterm
 +@unexec if cmp -s %D/etc/jfbterm.conf.sample %D/etc/jfbterm.conf; then rm -f %D/etc/jfbterm.conf; fi
  etc/jfbterm.conf.sample
 -%%DATADIR%%/fonts/vt100-graphics.pcf.gz
 -%%DATADIR%%/termcap.jfbterm
 -%%DATADIR%%/terminfo.jfbterm
 -@dirrm %%DATADIR%%/fonts
 -@dirrm %%DATADIR%%
 +@exec if [ ! -f %D/etc/jfbterm.conf ]; then cp -p %D/%F %B/jfbterm.conf; fi
 +%%PORTDATA%%%%DATADIR%%/fonts/vt100-graphics.pcf.gz
 +%%PORTDATA%%%%DATADIR%%/termcap.jfbterm
 +%%PORTDATA%%%%DATADIR%%/terminfo.jfbterm
 +%%PORTDATA%%@dirrm %%DATADIR%%/fonts
 +%%PORTDATA%%@dirrm %%DATADIR%%
 Index: sysutils/jfbterm/files/BSDmakefile
 ===================================================================
 RCS file: sysutils/jfbterm/files/BSDmakefile
 diff -N sysutils/jfbterm/files/BSDmakefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/BSDmakefile	30 Sep 2009 17:45:11 -0000
 @@ -0,0 +1,71 @@
 +PROG = jfbterm
 +MAN  = ${PROG}.1 ${PROG}.conf.5
 +
 +ARCH         ?= ${MACHINE_ARCH}
 +LOCALBASE    ?= /usr/local
 +PREFIX       ?= /usr/local
 +BINDIR       ?= ${PREFIX}/bin
 +MANDIR       ?= ${PREFIX}/man/man
 +DATADIR      ?= ${PREFIX}/share/${PROG}
 +LIBICONV     ?= ${LOCALBASE}/lib/libiconv.a
 +LIBPNG       ?= ${LOCALBASE}/lib/libpng.a
 +INSTALL_DIR  ?= ${INSTALL} -d
 +INSTALL_DATA ?= ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
 +
 +CSTD   ?= gnu89
 +CFLAGS += -I${LOCALBASE}/include
 +CFLAGS += -DHAVE_CONFIG_H
 +CFLAGS += -DSYSCONFDIR=\"${PREFIX}/etc\"
 +DPADD  += ${LIBUTIL}
 +LDADD  += -lutil
 +
 +.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 +CFLAGS += -DENABLE_VGA16FB
 +.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
 +LDADD  += -L${LOCALBASE}/lib
 +LDADD  += -liconv
 +DPADD  += ${LIBICONV}
 +.endif
 +
 +.if !defined(WITHOUT_PNG)
 +CFLAGS += -DWITH_LIBPNG
 +LDADD  += -L${LOCALBASE}/lib
 +LDADD  += -lpng
 +LDADD  += -lz
 +LDADD  += -lm
 +DPADD  += ${LIBPNG}
 +DPADD  += ${LIBZ}
 +DPADD  += ${LIBM}
 +.endif
 +
 +.if !defined(WITHOUT_SETUID)
 +BINMODE = 4555
 +.endif
 +
 +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
 +
 +afterinstall:
 +	${INSTALL_DATA} ${.CURDIR}/jfbterm.conf.sample.FreeBSD \
 +		${PREFIX}/etc/${PROG}.conf.sample
 +.if !defined(NOPORTDATA)
 +	${INSTALL_DIR} ${DATADIR}/fonts
 +	${INSTALL_DATA} ${.CURDIR}/fonts/*.pcf.gz ${DATADIR}/fonts
 +	${INSTALL_DATA} ${.CURDIR}/termcap.jfbterm ${DATADIR}
 +	${INSTALL_DATA} ${.CURDIR}/terminfo.jfbterm ${DATADIR}
 +.endif
 +
 +.include <bsd.prog.mk>
 Index: sysutils/jfbterm/files/config.h
 ===================================================================
 RCS file: sysutils/jfbterm/files/config.h
 diff -N sysutils/jfbterm/files/config.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/config.h	24 Sep 2009 08:32:40 -0000
 @@ -0,0 +1,9 @@
 +#define VERSION "0.6.0"
 +#define GUNZIP_PATH "/usr/bin/gunzip"
 +#define ENABLE_8BPP 1
 +#define ENABLE_15BPP 1
 +#define ENABLE_16BPP 1
 +#define ENABLE_24BPP 1
 +#define ENABLE_32BPP 1
 +#define ENABLE_SPLASH_SCREEN 1
 +#define ENABLE_256_COLOR 1
 Index: sysutils/jfbterm/files/patch-screensaver.c
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-screensaver.c
 diff -N sysutils/jfbterm/files/patch-screensaver.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/patch-screensaver.c	24 Sep 2009 08:42:21 -0000
 @@ -0,0 +1,11 @@
 +--- 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
 + 
 --- jfbterm.diff ends here ---

From: pgollucci@FreeBSD.org
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107 [patch] sysutils/jfbterm: convert to bsdmake
Date: Mon, 18 Jan 2010 02:26:48 -0500

 ping....
 

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Sun, 02 May 2010 13:06:40 +0400

 update for png14
 
 --- jfbterm.diff begins here ---
 Index: sysutils/jfbterm/Makefile
 ===================================================================
 RCS file: /a/.cvsup/ports/sysutils/jfbterm/Makefile,v
 retrieving revision 1.10
 diff -u -p -r1.10 Makefile
 --- sysutils/jfbterm/Makefile	28 Mar 2010 06:43:51 -0000	1.10
 +++ sysutils/jfbterm/Makefile	2 May 2010 09:02:50 -0000
 @@ -6,7 +6,7 @@
  
  PORTNAME=	jfbterm
  PORTVERSION=	0.6.0
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	sysutils
  MASTER_SITES=	http://www.ac.auone-net.jp/~baba/jfbterm/ \
  		http://chirashi-no-ura.net/files/
 @@ -15,24 +15,52 @@ DISTNAME=	${PORTNAME}-FreeBSD-${PORTVERS
  MAINTAINER=	bsdports@gmail.com
  COMMENT=	Multilanguage can be displayed on the console
  
 -LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 -RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 -
 -USE_ICONV=	yes
 -USE_GNOME=	pkgconfig
  PKGMESSAGE=	${WRKDIR}/pkg-message
  SUB_FILES=	pkg-message
 -USE_GMAKE=	yes
 -GNU_CONFIGURE=	yes
 -USE_AUTOTOOLS=	autoconf:262 automake:14
 -CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 -		LDFLAGS="-L${LOCALBASE}/lib" \
 -		--mandir="${LOCALBASE}/man"
 +MAKEFILE=	BSDmakefile
 +
 +OPTIONS=	ICONV	"encodings support"		On \
 +		PNG	"splash .png support"		On \
 +		UNIFONT	"install pan-unicode font"	On
  
 +.include <bsd.port.pre.mk>
 +
 +.if !defined(NOMAN)
  MAN1=	jfbterm.1
  MAN5=	jfbterm.conf.5
 +.endif
 +
 +.if !defined(NOMANCOMPRESS)
 +MANCOMPRESSED=	yes
 +.endif
  
 -post-install:
 -	@${CAT} ${PKGMESSAGE}
 +.if !defined(WITHOUT_ICONV)
 +USE_ICONV=	yes
 +.else
 +MAKE_ENV+=	WITHOUT_ICONV=
 +.endif
 +
 +.if !defined(WITHOUT_PNG)
 +LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 +.else
 +MAKE_ENV+=	WITHOUT_PNG=
 +.endif
 +
 +.if !defined(WITHOUT_UNIFONT)
 +RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 +.endif
 +
 +post-extract:	.SILENT
 +	${MKDIR} ${WRKSRC}/obj
 +.for f in BSDmakefile config.h
 +	${CP} ${FILESDIR}/${f} ${WRKSRC}
 +.endfor
 +
 +post-install:	.SILENT
 +	if  [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/${PORTNAME}.conf.sample \
 +			${PREFIX}/etc/${PORTNAME}.conf; \
 +	fi
 +	${CAT} ${PKGMESSAGE}
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: sysutils/jfbterm/pkg-plist
 ===================================================================
 RCS file: /a/.cvsup/ports/sysutils/jfbterm/pkg-plist,v
 retrieving revision 1.1
 diff -u -p -r1.1 pkg-plist
 --- sysutils/jfbterm/pkg-plist	19 Mar 2008 06:43:16 -0000	1.1
 +++ sysutils/jfbterm/pkg-plist	30 Sep 2009 18:17:47 -0000
 @@ -1,7 +1,9 @@
  bin/jfbterm
 +@unexec if cmp -s %D/etc/jfbterm.conf.sample %D/etc/jfbterm.conf; then rm -f %D/etc/jfbterm.conf; fi
  etc/jfbterm.conf.sample
 -%%DATADIR%%/fonts/vt100-graphics.pcf.gz
 -%%DATADIR%%/termcap.jfbterm
 -%%DATADIR%%/terminfo.jfbterm
 -@dirrm %%DATADIR%%/fonts
 -@dirrm %%DATADIR%%
 +@exec if [ ! -f %D/etc/jfbterm.conf ]; then cp -p %D/%F %B/jfbterm.conf; fi
 +%%PORTDATA%%%%DATADIR%%/fonts/vt100-graphics.pcf.gz
 +%%PORTDATA%%%%DATADIR%%/termcap.jfbterm
 +%%PORTDATA%%%%DATADIR%%/terminfo.jfbterm
 +%%PORTDATA%%@dirrm %%DATADIR%%/fonts
 +%%PORTDATA%%@dirrm %%DATADIR%%
 Index: sysutils/jfbterm/files/BSDmakefile
 ===================================================================
 RCS file: sysutils/jfbterm/files/BSDmakefile
 diff -N sysutils/jfbterm/files/BSDmakefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/BSDmakefile	30 Sep 2009 17:45:11 -0000
 @@ -0,0 +1,71 @@
 +PROG = jfbterm
 +MAN  = ${PROG}.1 ${PROG}.conf.5
 +
 +ARCH         ?= ${MACHINE_ARCH}
 +LOCALBASE    ?= /usr/local
 +PREFIX       ?= /usr/local
 +BINDIR       ?= ${PREFIX}/bin
 +MANDIR       ?= ${PREFIX}/man/man
 +DATADIR      ?= ${PREFIX}/share/${PROG}
 +LIBICONV     ?= ${LOCALBASE}/lib/libiconv.a
 +LIBPNG       ?= ${LOCALBASE}/lib/libpng.a
 +INSTALL_DIR  ?= ${INSTALL} -d
 +INSTALL_DATA ?= ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
 +
 +CSTD   ?= gnu89
 +CFLAGS += -I${LOCALBASE}/include
 +CFLAGS += -DHAVE_CONFIG_H
 +CFLAGS += -DSYSCONFDIR=\"${PREFIX}/etc\"
 +DPADD  += ${LIBUTIL}
 +LDADD  += -lutil
 +
 +.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 +CFLAGS += -DENABLE_VGA16FB
 +.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
 +LDADD  += -L${LOCALBASE}/lib
 +LDADD  += -liconv
 +DPADD  += ${LIBICONV}
 +.endif
 +
 +.if !defined(WITHOUT_PNG)
 +CFLAGS += -DWITH_LIBPNG
 +LDADD  += -L${LOCALBASE}/lib
 +LDADD  += -lpng
 +LDADD  += -lz
 +LDADD  += -lm
 +DPADD  += ${LIBPNG}
 +DPADD  += ${LIBZ}
 +DPADD  += ${LIBM}
 +.endif
 +
 +.if !defined(WITHOUT_SETUID)
 +BINMODE = 4555
 +.endif
 +
 +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
 +
 +afterinstall:
 +	${INSTALL_DATA} ${.CURDIR}/jfbterm.conf.sample.FreeBSD \
 +		${PREFIX}/etc/${PROG}.conf.sample
 +.if !defined(NOPORTDATA)
 +	${INSTALL_DIR} ${DATADIR}/fonts
 +	${INSTALL_DATA} ${.CURDIR}/fonts/*.pcf.gz ${DATADIR}/fonts
 +	${INSTALL_DATA} ${.CURDIR}/termcap.jfbterm ${DATADIR}
 +	${INSTALL_DATA} ${.CURDIR}/terminfo.jfbterm ${DATADIR}
 +.endif
 +
 +.include <bsd.prog.mk>
 Index: sysutils/jfbterm/files/config.h
 ===================================================================
 RCS file: sysutils/jfbterm/files/config.h
 diff -N sysutils/jfbterm/files/config.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/config.h	24 Sep 2009 08:32:40 -0000
 @@ -0,0 +1,9 @@
 +#define VERSION "0.6.0"
 +#define GUNZIP_PATH "/usr/bin/gunzip"
 +#define ENABLE_8BPP 1
 +#define ENABLE_15BPP 1
 +#define ENABLE_16BPP 1
 +#define ENABLE_24BPP 1
 +#define ENABLE_32BPP 1
 +#define ENABLE_SPLASH_SCREEN 1
 +#define ENABLE_256_COLOR 1
 Index: sysutils/jfbterm/files/patch-configure
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-configure
 diff -N sysutils/jfbterm/files/patch-configure
 --- sysutils/jfbterm/files/patch-configure	12 Mar 2010 20:39:12 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- configure.in.orig	2009-02-10 19:40:45.000000000 -0500
 -+++ configure.in	2010-02-22 16:37:33.000000000 -0500
 -@@ -111,7 +111,7 @@
 -   case $system in
 -   Linux|FreeBSD)
 -     case $machine in
 --    i?86|x86_64)
 -+    amd64|i?86|x86_64)
 -       AC_DEFINE(ENABLE_VGA16FB)
 -       ;;
 -     *)
 Index: sysutils/jfbterm/files/patch-screensaver.c
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-screensaver.c
 diff -N sysutils/jfbterm/files/patch-screensaver.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/patch-screensaver.c	24 Sep 2009 08:42:21 -0000
 @@ -0,0 +1,11 @@
 +--- 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
 + 
 Index: sysutils/jfbterm/files/patch-splash-png.c
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-splash-png.c
 diff -N sysutils/jfbterm/files/patch-splash-png.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/patch-splash-png.c	2 May 2010 08:59:29 -0000
 @@ -0,0 +1,11 @@
 +--- 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)
 --- jfbterm.diff ends here ---

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Tue, 04 May 2010 01:01:26 +0400

 Erm, more cleanups. I'm splitting some patches into separate PRs in case
 this one continues to be ignored, e.g. ports/146271, ports/146230.
 
 - use PREFIX in man pages, sample config file and pkg-message
 - remove redundant PKGMESSAGE assign
 - remove no longer needed step from pkg-message
 - update to 0.6.1
 - some cosmetic changes
 
 BTW, I'm not sure why we need kldload step in pkg-message when setuid
 binary will try to load vesa.ko anyway.
 
 --- jfbterm.diff begins here ---
 Index: sysutils/jfbterm/Makefile
 ===================================================================
 RCS file: /a/.cvsup/ports/sysutils/jfbterm/Makefile,v
 retrieving revision 1.10
 diff -u -p -r1.10 Makefile
 --- sysutils/jfbterm/Makefile	28 Mar 2010 06:43:51 -0000	1.10
 +++ sysutils/jfbterm/Makefile	3 May 2010 20:27:57 -0000
 @@ -5,34 +5,65 @@
  # $FreeBSD: ports/sysutils/jfbterm/Makefile,v 1.10 2010/03/28 06:43:51 dinoex Exp $
  
  PORTNAME=	jfbterm
 -PORTVERSION=	0.6.0
 -PORTREVISION=	2
 +PORTVERSION=	0.6.1
  CATEGORIES=	sysutils
 -MASTER_SITES=	http://www.ac.auone-net.jp/~baba/jfbterm/ \
 +MASTER_SITES=	http://www.ac.auone-net.jp/~baba/${PORTNAME}/ \
  		http://chirashi-no-ura.net/files/
  DISTNAME=	${PORTNAME}-FreeBSD-${PORTVERSION}
  
  MAINTAINER=	bsdports@gmail.com
  COMMENT=	Multilanguage can be displayed on the console
  
 -LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 -RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 -
 -USE_ICONV=	yes
 -USE_GNOME=	pkgconfig
 -PKGMESSAGE=	${WRKDIR}/pkg-message
  SUB_FILES=	pkg-message
 -USE_GMAKE=	yes
 -GNU_CONFIGURE=	yes
 -USE_AUTOTOOLS=	autoconf:262 automake:14
 -CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 -		LDFLAGS="-L${LOCALBASE}/lib" \
 -		--mandir="${LOCALBASE}/man"
 +MAKEFILE=	BSDmakefile
 +
 +OPTIONS=	ICONV	"encodings support"		On \
 +		PNG	"splash .png support"		On \
 +		UNIFONT	"install pan-unicode font"	On
  
 -MAN1=	jfbterm.1
 -MAN5=	jfbterm.conf.5
 +.include <bsd.port.pre.mk>
  
 -post-install:
 -	@${CAT} ${PKGMESSAGE}
 +.if !defined(NOMAN)
 +MAN1=		${PORTNAME}.1
 +MAN5=		${PORTNAME}.conf.5
 +.endif
 +
 +.if !defined(NOMANCOMPRESS)
 +MANCOMPRESSED=	yes
 +.endif
 +
 +.if !defined(WITHOUT_ICONV)
 +USE_ICONV=	yes
 +.else
 +MAKE_ENV+=	WITHOUT_ICONV=
 +.endif
 +
 +.if !defined(WITHOUT_PNG)
 +LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 +.else
 +MAKE_ENV+=	WITHOUT_PNG=
 +.endif
 +
 +.if !defined(WITHOUT_UNIFONT)
 +RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 +.endif
 +
 +post-extract:	.SILENT
 +	${MKDIR} ${WRKSRC}/obj
 +.for f in BSDmakefile config.h
 +	${CP} ${FILESDIR}/${f} ${WRKSRC}
 +.endfor
 +
 +post-patch:	.SILENT
 +	( cd ${WRKSRC}; ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' \
 +		${MAN1} ${MAN5} ${PORTNAME}.conf.sample.FreeBSD )
 +	${REINPLACE_CMD} '/VERSION/s/".*"/"${PORTVERSION}"/' ${WRKSRC}/config.h
 +
 +post-install:	.SILENT
 +	if  [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/${PORTNAME}.conf.sample \
 +			${PREFIX}/etc/${PORTNAME}.conf; \
 +	fi
 +	${CAT} ${PKGMESSAGE}
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: sysutils/jfbterm/distinfo
 ===================================================================
 RCS file: /a/.cvsup/ports/sysutils/jfbterm/distinfo,v
 retrieving revision 1.4
 diff -u -p -r1.4 distinfo
 --- sysutils/jfbterm/distinfo	1 Mar 2009 19:38:06 -0000	1.4
 +++ sysutils/jfbterm/distinfo	2 May 2010 14:26:11 -0000
 @@ -1,3 +1,3 @@
 -MD5 (jfbterm-FreeBSD-0.6.0.tar.gz) = 6b29125e987e11d779093bfe22c16792
 -SHA256 (jfbterm-FreeBSD-0.6.0.tar.gz) = adad94867d07e4f29020c31144786de9927d97752529b9ff6f7d81d1fc402915
 -SIZE (jfbterm-FreeBSD-0.6.0.tar.gz) = 203682
 +MD5 (jfbterm-FreeBSD-0.6.1.tar.gz) = fc5946d2ee0a9dae0d5aa6fc806416c3
 +SHA256 (jfbterm-FreeBSD-0.6.1.tar.gz) = 8cd44a8adcf3e329fdff762e7395ad1f37bcc23702a655802175d9baf5416026
 +SIZE (jfbterm-FreeBSD-0.6.1.tar.gz) = 218596
 Index: sysutils/jfbterm/pkg-plist
 ===================================================================
 RCS file: /a/.cvsup/ports/sysutils/jfbterm/pkg-plist,v
 retrieving revision 1.1
 diff -u -p -r1.1 pkg-plist
 --- sysutils/jfbterm/pkg-plist	19 Mar 2008 06:43:16 -0000	1.1
 +++ sysutils/jfbterm/pkg-plist	30 Sep 2009 18:17:47 -0000
 @@ -1,7 +1,9 @@
  bin/jfbterm
 +@unexec if cmp -s %D/etc/jfbterm.conf.sample %D/etc/jfbterm.conf; then rm -f %D/etc/jfbterm.conf; fi
  etc/jfbterm.conf.sample
 -%%DATADIR%%/fonts/vt100-graphics.pcf.gz
 -%%DATADIR%%/termcap.jfbterm
 -%%DATADIR%%/terminfo.jfbterm
 -@dirrm %%DATADIR%%/fonts
 -@dirrm %%DATADIR%%
 +@exec if [ ! -f %D/etc/jfbterm.conf ]; then cp -p %D/%F %B/jfbterm.conf; fi
 +%%PORTDATA%%%%DATADIR%%/fonts/vt100-graphics.pcf.gz
 +%%PORTDATA%%%%DATADIR%%/termcap.jfbterm
 +%%PORTDATA%%%%DATADIR%%/terminfo.jfbterm
 +%%PORTDATA%%@dirrm %%DATADIR%%/fonts
 +%%PORTDATA%%@dirrm %%DATADIR%%
 Index: sysutils/jfbterm/files/BSDmakefile
 ===================================================================
 RCS file: sysutils/jfbterm/files/BSDmakefile
 diff -N sysutils/jfbterm/files/BSDmakefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/BSDmakefile	3 May 2010 19:09:15 -0000
 @@ -0,0 +1,71 @@
 +PROG = jfbterm
 +MAN  = ${PROG}.1 ${PROG}.conf.5
 +
 +ARCH         ?= ${MACHINE_ARCH}
 +LOCALBASE    ?= /usr/local
 +PREFIX       ?= ${LOCALBASE}
 +BINDIR       ?= ${PREFIX}/bin
 +MANDIR       ?= ${PREFIX}/man/man
 +DATADIR      ?= ${PREFIX}/share/${PROG}
 +LIBICONV     ?= ${LOCALBASE}/lib/libiconv.a
 +LIBPNG       ?= ${LOCALBASE}/lib/libpng.a
 +INSTALL_DIR  ?= ${INSTALL} -d
 +INSTALL_DATA ?= ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
 +
 +CSTD   ?= gnu89
 +CFLAGS += -I${LOCALBASE}/include
 +CFLAGS += -DHAVE_CONFIG_H
 +CFLAGS += -DSYSCONFDIR=\"${PREFIX}/etc\"
 +DPADD  += ${LIBUTIL}
 +LDADD  += -lutil
 +
 +.if ${ARCH:Mamd64} || ${ARCH:Mi386}
 +CFLAGS += -DENABLE_VGA16FB
 +.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
 +LDADD  += -L${LOCALBASE}/lib
 +LDADD  += -liconv
 +DPADD  += ${LIBICONV}
 +.endif
 +
 +.if !defined(WITHOUT_PNG)
 +CFLAGS += -DWITH_LIBPNG
 +LDADD  += -L${LOCALBASE}/lib
 +LDADD  += -lpng
 +LDADD  += -lz
 +LDADD  += -lm
 +DPADD  += ${LIBPNG}
 +DPADD  += ${LIBZ}
 +DPADD  += ${LIBM}
 +.endif
 +
 +.if !defined(WITHOUT_SETUID)
 +BINMODE = 4555
 +.endif
 +
 +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
 +
 +afterinstall:
 +	${INSTALL_DATA} ${.CURDIR}/jfbterm.conf.sample.FreeBSD \
 +		${PREFIX}/etc/${PROG}.conf.sample
 +.if !defined(NOPORTDATA)
 +	${INSTALL_DIR} ${DATADIR}/fonts
 +	${INSTALL_DATA} ${.CURDIR}/fonts/*.pcf.gz ${DATADIR}/fonts
 +	${INSTALL_DATA} ${.CURDIR}/termcap.jfbterm ${DATADIR}
 +	${INSTALL_DATA} ${.CURDIR}/terminfo.jfbterm ${DATADIR}
 +.endif
 +
 +.include <bsd.prog.mk>
 Index: sysutils/jfbterm/files/config.h
 ===================================================================
 RCS file: sysutils/jfbterm/files/config.h
 diff -N sysutils/jfbterm/files/config.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/config.h	3 May 2010 19:58:01 -0000
 @@ -0,0 +1,9 @@
 +#define VERSION "0.6.1"
 +#define GUNZIP_PATH "/usr/bin/gunzip"
 +#define ENABLE_8BPP 1
 +#define ENABLE_15BPP 1
 +#define ENABLE_16BPP 1
 +#define ENABLE_24BPP 1
 +#define ENABLE_32BPP 1
 +#define ENABLE_SPLASH_SCREEN 1
 +#define ENABLE_256_COLOR 1
 Index: sysutils/jfbterm/files/patch-configure
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-configure
 diff -N sysutils/jfbterm/files/patch-configure
 --- sysutils/jfbterm/files/patch-configure	12 Mar 2010 20:39:12 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- configure.in.orig	2009-02-10 19:40:45.000000000 -0500
 -+++ configure.in	2010-02-22 16:37:33.000000000 -0500
 -@@ -111,7 +111,7 @@
 -   case $system in
 -   Linux|FreeBSD)
 -     case $machine in
 --    i?86|x86_64)
 -+    amd64|i?86|x86_64)
 -       AC_DEFINE(ENABLE_VGA16FB)
 -       ;;
 -     *)
 Index: sysutils/jfbterm/files/patch-screensaver.c
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-screensaver.c
 diff -N sysutils/jfbterm/files/patch-screensaver.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/patch-screensaver.c	24 Sep 2009 08:42:21 -0000
 @@ -0,0 +1,11 @@
 +--- 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
 + 
 Index: sysutils/jfbterm/files/patch-splash-png.c
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-splash-png.c
 diff -N sysutils/jfbterm/files/patch-splash-png.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ sysutils/jfbterm/files/patch-splash-png.c	2 May 2010 08:59:29 -0000
 @@ -0,0 +1,11 @@
 +--- 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)
 Index: sysutils/jfbterm/files/patch-utmpx
 ===================================================================
 RCS file: sysutils/jfbterm/files/patch-utmpx
 diff -N sysutils/jfbterm/files/patch-utmpx
 --- sysutils/jfbterm/files/patch-utmpx	4 Feb 2010 17:04:19 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,95 +0,0 @@
 ---- term.c.orig	2009-02-07 12:30:17.000000000 -0500
 -+++ term.c	2010-01-28 13:40:25.000000000 -0500
 -@@ -59,7 +59,11 @@
 - #include <termios.h>
 - #include <time.h>
 - #include <unistd.h>
 -+#ifdef HAVE_UTMP_H
 - #include <utmp.h>
 -+#else
 -+#include <utmpx.h>
 -+#endif
 - 
 - #if defined (__linux__)
 - #include <sys/vt.h>
 -@@ -523,6 +527,41 @@ static void writeLoginRecord(void)
 - 	pututline(&utmp);
 - 	endutent();
 - 	privilege_off();
 -+#elif defined (__FreeBSD__) && (__FreeBSD_version >= 900007)
 -+	struct utmpx utmp;
 -+	struct passwd *pw;
 -+	char *tn;
 -+
 -+	assert(initialized);
 -+
 -+	bzero(&utmp, sizeof(utmp));
 -+	pw = getpwuid(privilege_getUID());
 -+	if (pw == NULL) {
 -+		warnx("who are you?");
 -+		return; /* give up */
 -+	}
 -+	if (strncmp(self->device, "/dev/pts/", 9) == 0 ||
 -+	    strncmp(self->device, "/dev/tty", 8) == 0) {
 -+		/* Unix98 style: "/dev/pts/\*" */
 -+		/* BSD style: "/dev/tty[l-sL-S][0-9a-v]" */
 -+		tn = self->device + strlen("/dev/");
 -+		if (strlen(tn) < 5)
 -+			return; /* bad format */
 -+		strncpy(utmp.ut_id, tn, sizeof(utmp.ut_id));
 -+	} else
 -+		return; /* bad format */
 -+	utmp.ut_type = DEAD_PROCESS;
 -+	privilege_on();
 -+	setutxent();
 -+	getutxid(&utmp);
 -+	utmp.ut_type = USER_PROCESS;
 -+	utmp.ut_pid = getpid();
 -+	strncpy(utmp.ut_line, tn, sizeof(utmp.ut_line));
 -+	strncpy(utmp.ut_user, pw->pw_name, sizeof(utmp.ut_user));
 -+	gettimeofday(&(utmp.ut_tv), NULL);
 -+	pututxline(&utmp);
 -+	endutxent();
 -+	privilege_off();
 - #elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
 - 	struct utmp utmp;
 - 	struct passwd *pw;
 -@@ -600,6 +639,38 @@ static void eraseLoginRecord(void)
 - 	pututline(utp);
 - 	endutent();
 - 	privilege_off();
 -+#elif defined (__FreeBSD__) && (__FreeBSD_version >= 900007)
 -+	struct utmpx utmp, *utp;
 -+	char *tn;
 -+
 -+	assert(initialized);
 -+
 -+	bzero(&utmp, sizeof(utmp));
 -+	if (strncmp(self->device, "/dev/pts/", 9) == 0 ||
 -+	    strncmp(self->device, "/dev/tty", 8) == 0) {
 -+		/* Unix98 style: "/dev/pts/\*" */
 -+		/* BSD style: "/dev/tty[l-sL-S][0-9a-v]" */
 -+		tn = self->device + strlen("/dev/");
 -+		if (strlen(tn) < 5)
 -+			return; /* bad format */
 -+		strncpy(utmp.ut_id, tn, sizeof(utmp.ut_id));
 -+	} else
 -+		return; /* bad format */
 -+	utmp.ut_type = USER_PROCESS;
 -+	privilege_on();
 -+	setutxent();
 -+	utp = getutxid(&utmp);
 -+	if (utp == NULL) {
 -+		endutxent();
 -+		privilege_off();
 -+		return; /* give up */
 -+	}
 -+	utp->ut_type = DEAD_PROCESS;
 -+	bzero(utp->ut_user, sizeof(utmp.ut_user));
 -+	gettimeofday(&(utp->ut_tv), NULL);
 -+	pututxline(utp);
 -+	endutxent();
 -+	privilege_off();
 - #elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
 - 	struct utmp utmp;
 - 	char *tn;
 Index: sysutils/jfbterm/files/pkg-message.in
 ===================================================================
 RCS file: /a/.cvsup/ports/sysutils/jfbterm/files/pkg-message.in,v
 retrieving revision 1.2
 diff -u -p -r1.2 pkg-message.in
 --- sysutils/jfbterm/files/pkg-message.in	22 Apr 2008 15:39:30 -0000	1.2
 +++ sysutils/jfbterm/files/pkg-message.in	3 May 2010 20:44:12 -0000
 @@ -10,12 +10,9 @@ When you want to read automatically when
  please write vesa_load="YES" in /boot/loader.conf
  
  Add terminal capability of jfbterm.
 -    # cat %%LOCALBASE%%/share/jfbterm/termcap.jfbterm >> /usr/share/misc/termcap
 +    # cat %%PREFIX%%/share/jfbterm/termcap.jfbterm >> /usr/share/misc/termcap
      # cap_mkdb /usr/share/misc/termcap
  
 -Prepare configuration file
 -    # cp /usr/local/etc/jfbterm.conf.sample /usr/local/etc/jfbterm.conf
 -
  Please confirm details on author's page. 
  	http://www.ac.auone-net.jp/~baba/jfbterm/
  
 --- jfbterm.diff ends here ---

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Tue, 04 May 2010 02:11:03 +0400

 Oops, this should fix build on non-utmpx and without iconv systems.
 
 --- jfbterm.diff begins here ---
 --- Makefile~
 +++ Makefile
 @@ -35,6 +35,7 @@ MANCOMPRESSED=	yes
  .if !defined(WITHOUT_ICONV)
  USE_ICONV=	yes
  .else
 +BUILD_DEPENDS+=	${LOCALBASE}/include/iconv.h:${PORTSDIR}/converters/libiconv
  MAKE_ENV+=	WITHOUT_ICONV=
  .endif
  
 --- files/BSDmakefile~
 +++ files/BSDmakefile
 @@ -19,6 +19,10 @@ CFLAGS += -DSYSCONFDIR=\"${PREFIX}/etc\"
  DPADD  += ${LIBUTIL}
  LDADD  += -lutil
  
 +.if exists(/usr/include/utmp.h) || exists(${LOCALBASE}/include/utmp.h)
 +CFLAGS += -DHAVE_UTMP_H
 +.endif
 +
  .if ${ARCH:Mamd64} || ${ARCH:Mi386}
  CFLAGS += -DENABLE_VGA16FB
  .endif
 --- jfbterm.diff ends here ---
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jun 5 21:04:47 UTC 2010 
State-Changed-Why:  
fixed with 146238 commit. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139107 

From: Anonymous <swell.k@gmail.com>
To: miwi@FreeBSD.org
Cc: bug-followup@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Sun, 06 Jun 2010 07:51:05 +0000

 miwi@FreeBSD.org writes:
 
 > Synopsis: [patch] sysutils/jfbterm: convert to bsdmake
 >
 > State-Changed-From-To: feedback->closed
 > State-Changed-By: miwi
 > State-Changed-When: Sat Jun 5 21:04:47 UTC 2010
 > State-Changed-Why: 
 > fixed with 146238 commit.
 
 No. It still depends on autotools and doesn't build with gcc44+.
 This was the only PR that included *all* my fixes.
 
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=139107

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Fri, 11 Jun 2010 22:23:11 +0400

 To prevent flooding this PR with many minor diffs I'm putting my current
 version in cumulative diff here
 
   ftp://ftp.lissyara.su/users/Guest/jfbterm.diff
 
 BTW, BSDmakefile supports installing directly from WRKSRC.

From: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake
Date: Sat, 19 Jun 2010 02:23:25 +0400

 I've made termcap option in order to automate things a bit. Now it
 should work straight after installation with default jfbterm.conf.
 
 BTW, I'm using -nostdinc in order to include iconv.h from /usr/include
 for iconv support in libc[1]. It may not work if GNU iconv is installed
 with PREFIX=/usr though such a PREFIX would likely break more things
 than just this port.
 
 [1] http://docs.freebsd.org/cgi/mid.cgi?4C16C5B5.1070308
State-Changed-From-To: closed->open 
State-Changed-By: linimon 
State-Changed-When: Tue Aug 3 01:23:30 UTC 2010 
State-Changed-Why:  
Reopened at submitter's request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139107 
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Tue Sep 14 05:56:22 UTC 2010 
Responsible-Changed-Why:  
I will take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139107 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Tue Sep 14 07:12:58 UTC 2010 
State-Changed-Why:  
close in prep for new consolidated pr from submitter 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139107 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139107: commit references a PR
Date: Wed, 22 Sep 2010 05:40:26 +0000 (UTC)

 pgollucci    2010-09-22 05:40:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/jfbterm     Makefile pkg-descr pkg-plist 
   Added files:
     sysutils/jfbterm/files BSDmakefile patch-screensaver.c 
                            patch-splash-png.c 
   Removed files:
     sysutils/jfbterm/files patch-configure pkg-message.in 
   Log:
   Dispose of autotools[1]. While here fix these bugs:
   - GCC 4.4+ build (#elif with no expression)
   - use ENABLE_VGA16FB on amd64 (configure-script expects x86_64)
   
   and
   - move libiconv, libpng and gnu-unifont to respective options.
   All ON by default. With all options unset = empty all-depends-list.
   
   Requested by: paradox <ddkprog@yahoo.com>
   
   [1] This should reduce build time and lessen dependencies with little
   cost of maintaining more clear BSDmakefile and config.h that
   were based on Makefile.am, configure.in and config.h.in.
   
   Fix png14 regression
   
   Use PREFIX in man pages, config, pkg-message
   and drop redundant PKGMESSAGE assign as well
   
   Re-adding ONLY_FOR_ARCHS that was removed by lippe@ in r1.5 because
   while it builds fine the package may not work on archs without VESA support.
   
   All options are ON in order for package to work with default configuration.
   
   Tested building with BSDmakefile a bit on NetBSD and using
   devel/bmake port. Perhaps, it can be included upstream.
   
   PR:             ports/139107 (bsdmake), ports/146230 (png14), ports/146271 (PREFIX)
                   ports/150759 [this pr]
   Submitted by:   Anonymous <swell.k@gmail.com>
   
   Revision  Changes    Path
   1.13      +116 -22   ports/sysutils/jfbterm/Makefile
   1.1       +81 -0     ports/sysutils/jfbterm/files/BSDmakefile (new)
   1.2       +0 -11     ports/sysutils/jfbterm/files/patch-configure (dead)
   1.1       +11 -0     ports/sysutils/jfbterm/files/patch-screensaver.c (new)
   1.1       +11 -0     ports/sysutils/jfbterm/files/patch-splash-png.c (new)
   1.3       +0 -27     ports/sysutils/jfbterm/files/pkg-message.in (dead)
   1.2       +2 -1      ports/sysutils/jfbterm/pkg-descr
   1.2       +8 -5      ports/sysutils/jfbterm/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
