Index: usr.bin/dpv/GNUmakefile
===================================================================
--- /dev/null
+++ usr.bin/dpv/GNUmakefile
@@ -0,0 +1,48 @@
+# $FrauBSD$
+
+PROG=		dpv
+MAN=		dpv.1
+
+CFLAGS=		-Wall -I. -I/usr/include/dialog
+LIBS=		-lc -lcrypto -ldialog -ldpv -lfigpar -lncurses
+LDFLAGS=	$(LIBS)
+
+PREFIX=		/usr
+BINDIR=		$(PREFIX)/bin
+DATADIR=	$(PREFIX)/share
+MANDIR=		$(DATADIR)/man
+
+SRCS=		dpv.c
+OBJS=		dpv.o
+
+all: $(PROG) $(MAN).gz
+
+$(PROG): $(OBJS)
+	@eval2(){ echo "$$*"; eval "$$*"; }; \
+	 LDFLAGS="$(LDFLAGS)"; \
+	 [ "$${UNAME_s:-$$( uname -s )}" = Linux ] && \
+	 	LDFLAGS="$$LDFLAGS -lbsd"; \
+	 eval2 $(CC) $(OBJS) $$LDFLAGS -o $(@)
+
+$(MAN).gz: $(MAN)
+	gzip -c $(MAN) > $(@)
+
+$(OBJS): $(SRCS)
+	$(CC) $(CFLAGS) -c $(?) -o $(@)
+
+install: $(PROG)
+	install -d -o 0 -g 0 -m 755 $(BINDIR) $(MANDIR)/man1
+	install -C -o 0 -g 0 -m 555 $(PROG) $(BINDIR)/
+	install -C -o 0 -g 0 -m 444 $(MAN).gz $(MANDIR)/man1/
+
+uninstall:
+	rm -f $(BINDIR)/$(PROG) $(MANDIR)/man1/$(MAN).gz
+
+clean:
+	rm -f $(OBJS) $(MAN).gz $(MAN).cat.gz
+	rm -f $(PROG) $(PROG).full $(PROG).debug
+
+cleandepend:
+	rm -f .depend .depend.* GPATH GRTAGS GSYMS GTAGS
+
+cleandir: clean cleandepend
Index: usr.bin/dpv/dpv.c
===================================================================
--- usr.bin/dpv/dpv.c
+++ usr.bin/dpv/dpv.c
@@ -25,12 +25,16 @@
  */
 
 #include <sys/cdefs.h>
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#ifndef _BSD_SOURCE
 #define _BSD_SOURCE /* to get dprintf() prototype in stdio.h below */
+#endif
 #include <dialog.h>
 #include <dpv.h>
 #include <err.h>
@@ -99,7 +103,11 @@
 			fd = STDIN_FILENO;
 			if (isatty(fd)) {
 				fd = open("/dev/stdin", O_RDONLY);
+#if defined(__linux__) || defined(__APPLE__)
+				close(fd++);
+#else
 				close(fd--);
+#endif
 			}
 
 			/* This answer might be wrong, if dpv(3) has (by
Index: usr.bin/dpv/dpv_util.h
===================================================================
--- usr.bin/dpv/dpv_util.h
+++ usr.bin/dpv/dpv_util.h
@@ -65,4 +65,13 @@
 #define LINE_STATUS_SOLO	"%'10lli lines read @ %'9.1f lines/sec."
 #define LINE_STATUS_MANY	(LINE_STATUS_SOLO " [%i/%i busy/wait]")
 
+/* compatibility */
+#ifndef __unused
+# ifdef __GNUC__
+#   define __unused __attribute__((unused))
+# else
+#   define __unused
+# endif
+#endif
+
 #endif /* !_DPV_UTIL_H_ */