Date: Sun, 2 May 2010 09:10:13 GMT From: Anonymous <swell.k@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/139107: [patch] sysutils/jfbterm: convert to bsdmake Message-ID: <201005020910.o429ADL4053673@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/139107; it has been noted by GNATS. 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 ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005020910.o429ADL4053673>