Import of pkgsrc-2013Q2

x11/wterm/DESCR

@@ -0,0 +1,5 @@
+  Wterm is an unofficial development branch of rxvt for WindowMaker,
+which adds true NeXT style scrollbars, transparent backgrounds with
+optional shading, and other additions.  Unlike many other efforts,
+wterm aims to have its changed merged back into the parent rxvt
+rather than forking off yet another separate terminal emulator.

x11/wterm/Makefile

@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.53 2013/06/06 12:55:22 wiz Exp $
+
+DISTNAME=	wterm-6.2.9
+PKGREVISION=	22
+CATEGORIES=	x11 windowmaker
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wterm/}
+
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://wterm.sourceforge.net/
+COMMENT=	NeXTStep(tm) style X11 terminal emulator for WindowMaker
+
+MAKE_JOBS_SAFE=	no
+
+GNU_CONFIGURE=	YES
+USE_X11BASE=	YES
+
+CONFIGURE_ARGS+= --enable-utmp --enable-wtmp
+CONFIGURE_ARGS+= --enable-xpm-background --enable-transparency
+CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll
+CONFIGURE_ARGS+= --enable-half-shadow
+CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}
+
+INSTALLATION_DIRS+=	share/WindowMaker/Icons
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/wterm.tiff \
+		${DESTDIR}${PREFIX}/share/WindowMaker/Icons
+	${INSTALL_DATA} ${WRKSRC}/wtermthai.tiff \
+		${DESTDIR}${PREFIX}/share/WindowMaker/Icons
+
+SPECIAL_PERMS+=	bin/wterm ${SETUID_ROOT_PERMS}
+
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../wm/windowmaker/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

x11/wterm/PLIST

@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:51 zuntum Exp $
+bin/wterm
+man/man1/wterm.1
+share/WindowMaker/Icons/wterm.tiff
+share/WindowMaker/Icons/wtermthai.tiff

x11/wterm/distinfo

@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.12 2011/11/26 17:19:13 marino Exp $
+
+SHA1 (wterm-6.2.9.tar.gz) = e3624d44c70f143ec77a6089ce4074357a9c3ae8
+RMD160 (wterm-6.2.9.tar.gz) = 954c6264998456e90a62e25089fb5adc3924b2a8
+Size (wterm-6.2.9.tar.gz) = 316773 bytes
+SHA1 (patch-aa) = c4b2da58aefecba9c1acd5058a27dfeb551f7f54
+SHA1 (patch-ab) = b0103999bf2d38e61d46772d0396c45102e8f559
+SHA1 (patch-ac) = 5dd3db02b265872c6cfb8dc8e47957c3bdfe8224
+SHA1 (patch-ad) = 2f5e03a8f8096358050cf5fb9f27b5e590d77f58
+SHA1 (patch-ae) = 55237ec4c7aa49c313cc0811f345249eeff0f0ed
+SHA1 (patch-af) = f11833b22911f758e7bba214ec6e2bb6943c0f90

x11/wterm/patches/patch-aa

@@ -0,0 +1,53 @@
+$NetBSD: patch-aa,v 1.5 2011/11/26 17:19:13 marino Exp $
+
+--- src/wterm.h.orig	Sun Mar  5 12:22:32 2000
++++ src/wterm.h	Thu Nov 21 17:13:53 2002
+@@ -117,6 +117,9 @@
+ #ifdef UTMP_SUPPORT
+ # ifdef HAVE_UTMPX_H
+ #  define __USE_GNU
++#  ifdef __NetBSD__
++#   include <utmp.h>
++#  endif
+ #  include <utmpx.h>
+ #  define USE_SYSV_UTMP
+ # else
+@@ -435,10 +438,14 @@
+ #   ifdef _PATH_UTMP
+ #    define UTMP_FILENAME		_PATH_UTMP
+ #   else
+-#    ifdef WTERM_UTMP_FILE
+-#     define UTMP_FILENAME		WTERM_UTMP_FILE
++#    ifdef _PATH_UTMPX
++#     define UTMP_FILENAME		_PATH_UTMPX
+ #    else
+-#     error define UTMP_FILENAME in config.h
++#     ifdef WTERM_UTMP_FILE
++#      define UTMP_FILENAME		WTERM_UTMP_FILE
++#     else
++#      error define UTMP_FILENAME in config.h
++#     endif
+ #    endif
+ #   endif
+ #  endif
+@@ -458,6 +465,7 @@
+ #  define getutid		getutxid
+ #  define endutent		endutxent
+ #  define pututline		pututxline
++#  define utmpname		utmpxname
+ # else
+ #  define UTMP			struct utmp
+ # endif
+@@ -466,7 +474,11 @@
+ #ifdef WTMP_SUPPORT
+ # ifdef HAVE_UTMPX_H		/* means we're on Solaris (or Irix?) */
+ #  undef WTMP_FILENAME
+-#  define WTMP_FILENAME		WTMPX_FILE
++#  if defined(__NetBSD__) || defined(__DragonFly__)
++#   define WTMP_FILENAME	_PATH_WTMPX
++#  else
++#   define WTMP_FILENAME	WTMPX_FILE
++#  endif
+ #  define update_wtmp		updwtmpx
+ # else
+ #  define update_wtmp		wterm_update_wtmp

x11/wterm/patches/patch-ab

@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.5 2002/10/16 15:01:25 bouyer Exp $
+
+--- src/utmp.c.orig	Sun Mar  5 12:21:34 2000
++++ src/utmp.c	Wed Oct 16 16:53:32 2002
+@@ -71,7 +71,7 @@
+ #ifdef WTMP_SUPPORT
+ /* PROTO */
+ void
+-wterm_update_wtmp(char *fname, struct utmp *putmp)
++wterm_update_wtmp(char *fname, UTMP *putmp)
+ {
+     int             fd, retry = 10;	/* 10 attempts at locking */
+     struct flock    lck;	/* fcntl locking scheme */
+@@ -90,7 +90,7 @@
+ 	    close(fd);
+ 	    return;		/* failed for unknown reason: give up */
+ 	}
+-    write(fd, putmp, sizeof(struct utmp));
++    write(fd, putmp, sizeof(UTMP));
+ 
+ /* unlocking the file */
+     lck.l_type = F_UNLCK;
+@@ -218,8 +218,13 @@
+ #endif				/* HAVE_UTMP_HOST */
+ 
+ /* ut_name is normally the same as ut_user, but .... */
++#ifdef HAVE_UTMPX_H
++    STRNCPY(utmp.ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
++	    sizeof(utmp.ut_user));
++#else
+     STRNCPY(utmp.ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
+ 	    sizeof(utmp.ut_name));
++#endif
+ 
+     utmp.ut_pid = getpid();
+ 

x11/wterm/patches/patch-ac

@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1 2002/10/27 13:44:20 bouyer Exp $
+
+--- autoconf/configure.in.orig	Wed Oct 16 18:31:29 2002
++++ autoconf/configure.in	Wed Oct 16 18:46:43 2002
+@@ -381,8 +381,14 @@
+ 	unsetenv \
+ 	setutent \
+ 	seteuid \
++	openpty \
+ )
+ 
++if test $ac_cv_func_openpty = no; then
++    # not in libc, check for libutil
++    AC_CHECK_LIB(util, openpty, [LIBS="$LIBS -lutil"; break])
++fi
++
+ dnl# check for host field in utmp structure
+ 
+ AC_CACHE_CHECK(for host in utmp struct, wterm_cv_struct_utmp_host,

x11/wterm/patches/patch-ae

@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/10/27 13:44:20 bouyer Exp $
+
+--- src/Makefile.in.orig	Wed Oct 16 18:49:15 2002
++++ src/Makefile.in	Wed Oct 16 18:49:21 2002
+@@ -45,7 +45,7 @@
+ all: wterm
+ 
+ wterm: version.h $(PROS) $(OBJS)
+-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB) $(DLIB) -lutil
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB) $(DLIB)
+ 
+ .c.pro:
+ 	$(SED) -n -f $(srcdir)/makeprotos-sed $< > $@

x11/wterm/patches/patch-af

@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2008/05/22 12:30:44 tron Exp $
+
+--- src/main.c.orig	2001-08-17 05:47:41.000000000 +0100
++++ src/main.c	2008-05-22 13:20:38.000000000 +0100
+@@ -1444,8 +1444,10 @@
+ /*
+  * Open display, get options/resources and create the window
+  */
+-    if ((display_name = getenv("DISPLAY")) == NULL)
+-	display_name = ":0";
++    if ((display_name = getenv("DISPLAY")) == NULL) {
++	print_error("display not defined");
++	exit(EXIT_FAILURE);
++    }
+ 
+     get_options(argc, argv);
+