Attachment 145377 Details for Bug 192391 – stagedir support patch

[patch] stagedir support patch

jfbterm-stagedir.diff (text/plain), 3.17 KB, created by IWAMOTO Kouichi on 2014-08-05 05:12:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IWAMOTO Kouichi

Created: 2014-08-05 05:12:46 UTC

Size: 3.17 KB

patch

obsolete

>diff -urN jfbterm.orig/Makefile jfbterm/Makefile
>--- jfbterm.orig/Makefile	2014-08-04 12:55:18.000000000 +0900
>+++ jfbterm/Makefile	2014-08-05 14:03:45.000000000 +0900
>@@ -4,14 +4,14 @@
> PORTNAME=	jfbterm
> PORTVERSION=	0.6.1
> DISTVERSIONPREFIX=${OPSYS}-
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.ac.auone-net.jp/~baba/${PORTNAME}/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Multilingual terminal emulator for framebuffer
> 
>-LICENSE=	BSD
>+LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> ONLY_FOR_ARCHS=	i386 amd64
>@@ -34,11 +34,12 @@
> TERMCAP_DESC=		Add entry to termcap(5) file
> UNIFONT_DESC=		Install pan-unicode font
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MSETUID}
>-BINMODE?=	4555
>+PLIST_SUB+=	SETUID=""
>+.else
>+PLIST_SUB+=	SETUID="@comment "
> .endif
> 
> ONLY_FOR_ARCHS+=amd64
>@@ -49,11 +50,6 @@
> TERMCAP_FILE?=	~/.termcap
> .endif
> 
>-.if !defined(NO_INSTALL_MANPAGES)
>-MAN1=		${PORTNAME}.1
>-MAN5=		${PORTNAME}.conf.5
>-.endif
>-
> .if ${PORT_OPTIONS:MICONV}
> USES+=		iconv
> .else
>@@ -114,25 +110,17 @@
> .endif
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${PREFIX}/etc
>-	if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
>-		${INSTALL_DATA} ${PREFIX}/etc/${PORTNAME}.conf.sample \
>-			${PREFIX}/etc/${PORTNAME}.conf; \
>-	fi
>+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc
> .if !defined(NO_INSTALL_MANPAGES)
>-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/${MAN5} ${MAN5PREFIX}/man/man5
>+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
> .endif
> .if !defined(NOPORTDATA)
>-	${INSTALL_DATA} ${WRKSRC}/termcap.${PORTNAME} ${PREFIX}/share/misc/${PORTNAME}.termcap
>-	${INSTALL_DATA} ${WRKSRC}/terminfo.${PORTNAME} ${PREFIX}/share/misc/${PORTNAME}.terminfo
>-	${MKDIR} ${PREFIX}/share/misc/fonts
>-	${INSTALL_DATA} ${WRKSRC}/fonts/*.pcf.gz ${PREFIX}/share/misc/fonts
>-. if ${PORT_OPTIONS:MTERMCAP}
>-	${TERMCAP_ADD_RECORD}
>-. endif
>-	-${TIC} ${TERMINFO_FILE} 2>/dev/null
>+	${INSTALL_DATA} ${WRKSRC}/termcap.${PORTNAME} ${STAGEDIR}${PREFIX}/share/misc/${PORTNAME}.termcap
>+	${INSTALL_DATA} ${WRKSRC}/terminfo.${PORTNAME} ${STAGEDIR}${PREFIX}/share/misc/${PORTNAME}.terminfo
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/misc/fonts
>+	${INSTALL_DATA} ${WRKSRC}/fonts/*.pcf.gz ${STAGEDIR}${PREFIX}/share/misc/fonts
> .endif
> 
> .include <bsd.port.mk>
>diff -urN jfbterm.orig/pkg-plist jfbterm/pkg-plist
>--- jfbterm.orig/pkg-plist	2014-03-25 10:06:23.000000000 +0900
>+++ jfbterm/pkg-plist	2014-08-05 09:45:45.000000000 +0900
>@@ -1,7 +1,11 @@
>+%%SETUID%%@mode 4555
> bin/jfbterm
>+%%SETUID%%@mode
> @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
> @exec if [ ! -f %D/etc/jfbterm.conf ]; then cp -p %D/%F %B/jfbterm.conf; fi
>+man/man1/jfbterm.1.gz
>+man/man5/jfbterm.conf.5.gz
> %%PORTDATA%%share/misc/fonts/vt100-graphics.pcf.gz
> %%PORTDATA%%share/misc/jfbterm.termcap
> %%PORTDATA%%share/misc/jfbterm.terminfo

Actions: View | Diff

Attachments on bug 192391: 145377