Update to eterm-0.9.6.
This commit is contained in:
ajacoutot
parent
57c0b91953
commit
b3c048b216
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.42 2015/03/16 18:07:58 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.43 2015/06/25 13:00:58 ajacoutot Exp $
|
||||
|
||||
COMMENT= color X11 terminal emulator with transparency support
|
||||
COMMENT-kanji= color japanese terminal emulator with transparency support
|
||||
|
||||
V= 0.9.5
|
||||
V= 0.9.6
|
||||
DISTNAME= Eterm-$V
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
|
||||
# also see below
|
||||
PKGNAME= eterm-$V
|
||||
SHARED_LIBS += Eterm 1.0 # .0.0
|
||||
SHARED_LIBS += Eterm 1.0 # unknown
|
||||
CATEGORIES= x11
|
||||
REVISION= 3
|
||||
|
||||
HOMEPAGE= http://www.eterm.org/
|
||||
|
||||
@ -21,18 +20,15 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
MASTER_SITES= ${HOMEPAGE}/download/ \
|
||||
${MASTER_SITE_SOURCEFORGE:=eterm/}
|
||||
|
||||
WANTLIB += ICE Imlib2 SM X11 XRes Xau Xdmcp Xext Xmu Xt c freetype
|
||||
WANTLIB += m pthread-stubs util xcb z ast ttf
|
||||
WANTLIB += ICE Imlib2 SM X11 XRes Xext ast c freetype m ttf util
|
||||
WANTLIB += xcb z
|
||||
|
||||
MODULES+= converters/libiconv
|
||||
MODULES= converters/libiconv
|
||||
|
||||
LIB_DEPENDS= devel/libast \
|
||||
print/freetype
|
||||
|
||||
USE_GROFF = Yes
|
||||
|
||||
AUTOCONF_VERSION=2.59
|
||||
CONFIGURE_STYLE=autoconf
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--enable-trans \
|
||||
--enable-utmp \
|
||||
@ -42,7 +38,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--with-backspace=bs \
|
||||
--without-terminfo
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
LDFLAGS="-L${LOCALBASE}/lib -liconv"
|
||||
|
||||
FLAVORS= kanji
|
||||
FLAVOR?=
|
||||
@ -55,9 +51,6 @@ CONFIGURE_ARGS+=--enable-multi-charset=kanji
|
||||
CONFIGURE_ARGS+=--enable-multi-charset
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
ln -sf ${WRKSRC} ${WRKDIR}/Eterm
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Eterm
|
||||
${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Eterm-0.9.5.tar.gz) = Y61uPYlXGnLYMCJ067ANVpuHieJPrgOL6u56pLg2K9I=
|
||||
SIZE (Eterm-0.9.5.tar.gz) = 796872
|
||||
SHA256 (Eterm-0.9.6.tar.gz) = crkHqmT4vPBT8uy8ii4kPG3jU6lOyvV5/yxOOuXX4Tw=
|
||||
SIZE (Eterm-0.9.6.tar.gz) = 831756
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2012/12/17 18:37:59 naddy Exp $
|
||||
--- configure.in.orig Wed May 14 21:49:22 2008
|
||||
+++ configure.in Thu Dec 13 21:02:23 2012
|
||||
@@ -220,7 +220,7 @@ AC_TYPE_UID_T
|
||||
dnl# Checks for library functions.
|
||||
AC_TYPE_SIGNAL
|
||||
AC_CHECK_FUNCS(atexit _exit unsetenv setutent \
|
||||
-seteuid memmove putenv strsep setresuid setresgid \
|
||||
+seteuid setegid memmove putenv strsep setresuid setresgid \
|
||||
memmem usleep snprintf strcasestr strcasechr \
|
||||
strcasepbrk strrev nl_langinfo \
|
||||
)
|
||||
@@ -259,6 +259,9 @@ AC_ARG_WITH(debugging, [ --with-debugging[=num] enab
|
||||
AC_DEFINE_UNQUOTED(DEBUG, 4, [Debugging level to compile in.])
|
||||
])
|
||||
|
||||
+AC_CHECK_FUNC(posix_openpt,
|
||||
+ HAVE_POSIX_OPENPT=yes
|
||||
+ )
|
||||
AC_CHECK_FUNC(ptsname,
|
||||
HAVE_PTSNAME=yes
|
||||
)
|
||||
@@ -274,6 +277,10 @@ PTY_MECH=""
|
||||
if test -c /dev/ptc ; then
|
||||
AC_DEFINE(HAVE_DEV_PTC, , [Define for /dev/ptc support.])
|
||||
PTY_MECH="AIX $PTY_MECH"
|
||||
+fi
|
||||
+if ! -z "$HAVE_POSIX_OPENPT" -a ! -z "$HAVE_PTSNAME" -a ! -z "$HAVE_GRANTPT" -a ! -z "$HAVE_UNLOCKPT"; then
|
||||
+ AC_DEFINE(HAVE_POSIX_PTYS, , [Define for POSIX pty support.])
|
||||
+ PTY_MECH="POSIX $PTY_MECH"
|
||||
fi
|
||||
if test -r /dev/ptmx -a ! -z "$HAVE_PTSNAME" -a ! -z "$HAVE_GRANTPT" -a ! -z "$HAVE_UNLOCKPT"; then
|
||||
AC_DEFINE(HAVE_DEV_PTMX, , [Define for /dev/ptmx support.])
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.2 2007/11/18 12:55:58 jasper Exp $
|
||||
--- doc/Makefile.in.orig Wed Nov 14 17:01:18 2007
|
||||
+++ doc/Makefile.in Wed Nov 14 17:02:03 2007
|
||||
@@ -414,7 +414,7 @@ uninstall-man: uninstall-man1
|
||||
uninstall-man1
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.3 2015/06/25 13:00:58 ajacoutot Exp $
|
||||
--- doc/Makefile.in.orig Wed Mar 16 07:10:30 2011
|
||||
+++ doc/Makefile.in Thu Jun 25 14:40:32 2015
|
||||
@@ -417,7 +417,7 @@ uninstall-man: uninstall-man1
|
||||
uninstall-man uninstall-man1
|
||||
|
||||
|
||||
-all: Makefile Eterm.1.html
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1 2007/11/18 12:55:58 jasper Exp $
|
||||
--- src/Makefile.in.orig Wed Nov 14 17:36:17 2007
|
||||
+++ src/Makefile.in Wed Nov 14 17:36:35 2007
|
||||
@@ -257,7 +257,7 @@ libEterm_la_SOURCES = actions.c actions.h buttons.c bu
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2015/06/25 13:00:58 ajacoutot Exp $
|
||||
--- src/Makefile.in.orig Wed Mar 16 07:10:30 2011
|
||||
+++ src/Makefile.in Thu Jun 25 14:40:32 2015
|
||||
@@ -250,7 +250,7 @@ libEterm_la_SOURCES = actions.c actions.h buttons.c bu
|
||||
defaultfont.h libscream.c scream.h screamcfg.h
|
||||
|
||||
EXTRA_libEterm_la_SOURCES = $(MMX_SRCS) $(SSE2_SRCS)
|
||||
-libEterm_la_LDFLAGS = -release $(VERSION)
|
||||
+libEterm_la_LDFLAGS = -version-info 0:0:0
|
||||
+libEterm_la_LDFLAGS =
|
||||
@HAVE_MMX_FALSE@@HAVE_SSE2_FALSE@libEterm_la_DEPENDENCIES = feature.h
|
||||
@HAVE_MMX_TRUE@@HAVE_SSE2_FALSE@libEterm_la_DEPENDENCIES = feature.h $(MMX_OBJS)
|
||||
@HAVE_SSE2_TRUE@libEterm_la_DEPENDENCIES = feature.h $(SSE2_OBJS)
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-src_command_c,v 1.1 2012/12/17 18:37:59 naddy Exp $
|
||||
--- src/command.c.orig Thu Dec 13 21:00:06 2012
|
||||
+++ src/command.c Thu Dec 13 21:03:35 2012
|
||||
@@ -1386,7 +1386,7 @@ sco_get_pty(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_DEV_PTMX
|
||||
+#if defined(HAVE_POSIX_PTYS) || defined(HAVE_DEV_PTMX)
|
||||
inline int svr_get_pty(void);
|
||||
|
||||
inline int
|
||||
@@ -1395,8 +1395,12 @@ svr_get_pty(void)
|
||||
|
||||
int fd = -1;
|
||||
|
||||
+#ifdef HAVE_POSIX_PTYS
|
||||
+ if ((fd = posix_openpt(O_RDWR|O_NOCTTY)) < 0) {
|
||||
+#else
|
||||
/* open the STREAMS, clone device /dev/ptmx (master pty) */
|
||||
if ((fd = open("/dev/ptmx", O_RDWR)) < 0) {
|
||||
+#endif
|
||||
return (-1);
|
||||
} else {
|
||||
if (grantpt(fd) != 0) {
|
||||
@@ -1459,7 +1463,7 @@ get_pty(void)
|
||||
fd = sgi_get_pty();
|
||||
#elif defined(HAVE_DEV_PTC)
|
||||
fd = aix_get_pty();
|
||||
-#elif defined(HAVE_DEV_PTMX)
|
||||
+#elif defined(HAVE_POSIX_PTYS) || defined(HAVE_DEV_PTMX)
|
||||
fd = svr_get_pty();
|
||||
#elif defined(HAVE_SCO_PTYS)
|
||||
fd = sco_get_pty();
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-src_system_c,v 1.1 2007/11/18 12:55:58 jasper Exp $
|
||||
--- src/system.c.orig Wed Nov 14 17:23:12 2007
|
||||
+++ src/system.c Wed Nov 14 17:24:12 2007
|
||||
@@ -99,8 +99,16 @@ system_no_wait(char *command)
|
||||
D_OPTIONS(("system_no_wait(%s) called.\n", command));
|
||||
|
||||
if (!(pid = fork())) {
|
||||
+#ifdef HAVE_SETEUID
|
||||
+ seteuid(my_ruid);
|
||||
+#else
|
||||
setreuid(my_ruid, my_ruid);
|
||||
+#endif
|
||||
+#ifdef HAVE_SETEGID
|
||||
+ setegid(my_rgid);
|
||||
+#else
|
||||
setregid(my_rgid, my_rgid);
|
||||
+#endif
|
||||
execl("/bin/sh", "sh", "-c", command, (char *) NULL);
|
||||
libast_print_error("execl(%s) failed -- %s\n", command, strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
Loading…
Reference in New Issue
Block a user