- Update to 2.0.3

- Reformat the Makefile

5 files changed, 25 insertions, 50 deletions

diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile
index 6fc499b1a475..d93a4386e8bf 100644
--- a/shells/viewglob/Makefile
+++ b/shells/viewglob/Makefile
@@ -5,25 +5,23 @@
 # $FreeBSD$
 #
 
-PORTNAME=		viewglob
-PORTVERSION=		1.0.2
-PORTREVISION=	1
-CATEGORIES=		shells
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+PORTNAME=	viewglob
+PORTVERSION=	2.0.3
+CATEGORIES=	shells
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		jylefort@FreeBSD.org
-COMMENT=		A GTK+ add-on to bash and zsh
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT=	A GTK+ add-on to bash and zsh
 
-BUILD_DEPENDS=		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USE_X_PREFIX=		yes
-USE_GNOME=		gtk20
-GNU_CONFIGURE=		yes
-USE_GCC=		3.4
+USE_X_PREFIX=	yes
+USE_GNOME=	gtk20
+GNU_CONFIGURE=	yes
 
-MAN1=			gviewglob.1 viewglob.1
+MAN1=		vgd.1 vgseer.1 viewglob.1
 
 .include <bsd.port.pre.mk>
 
@@ -31,7 +29,4 @@ MAN1=			gviewglob.1 viewglob.1
 IGNORE=	does not compile on FreeBSD 4.x, it's missing posix_openpt and ptsname functions
 .endif
 
-post-extract:
-	@${CP} ${WRKSRC}/src/tc_setraw.h ${WRKSRC}/src/tc_setraw.viewglob.h
-
 .include <bsd.port.post.mk>
diff --git a/shells/viewglob/distinfo b/shells/viewglob/distinfo
index 74a3c3f9a7ca..ef0f8ad7303a 100644
--- a/shells/viewglob/distinfo
+++ b/shells/viewglob/distinfo
@@ -1,2 +1,2 @@
-MD5 (viewglob-1.0.2.tar.gz) = b7ddd1d31d84f300229defd2872ee35a
-SIZE (viewglob-1.0.2.tar.gz) = 202523
+MD5 (viewglob-2.0.3.tar.gz) = 2c0b9713c4171edebae3f553e0b8efbb
+SIZE (viewglob-2.0.3.tar.gz) = 325355
diff --git a/shells/viewglob/files/patch-src::Makefile.in b/shells/viewglob/files/patch-src::Makefile.in
deleted file mode 100644
index 9b28ec34d26d..000000000000
--- a/shells/viewglob/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.in.orig	Tue Jan 18 19:14:11 2005
-+++ src/Makefile.in	Tue Jan 18 19:14:58 2005
-@@ -91,7 +91,6 @@
- # Very slight modifications to these files from Marc J. Rochkind's
- # book Advanced Unix Programming 2nd ed.  You can get them on the
- # web at: http://www.basepath.com/aup/
--BUILT_SOURCES = tc_setraw.viewglob.c tc_setraw.viewglob.h
- 
- CLEANFILES = viewglob .zshrc getopt.sh \
-              tc_setraw.viewglob.c tc_setraw.viewglob.h
-@@ -478,10 +477,10 @@
- 
- .zshrc: Makefile
- 	cp -f init-viewglob.zshrc .zshrc
--tc_setraw.viewglob.c: Makefile
-+tc_setraw.viewglob.c:
- 	rm -f tc_setraw.viewglob.c
- 	patch -i tc_setraw.c.diff -o tc_setraw.viewglob.c tc_setraw.c
--tc_setraw.viewglob.h: Makefile
-+tc_setraw.viewglob.h:
- 	rm -f tc_setraw.viewglob.h
- 	patch -i tc_setraw.h.diff -o tc_setraw.viewglob.h tc_setraw.h
- 
diff --git a/shells/viewglob/files/patch-src::ptytty.c b/shells/viewglob/files/patch-vgseer_ptytty.c
index 29f2294732a8..8e0e0e33f58d 100644
--- a/shells/viewglob/files/patch-src::ptytty.c
+++ b/shells/viewglob/files/patch-vgseer_ptytty.c
@@ -1,6 +1,6 @@
---- src/ptytty.c.orig	Fri Nov 19 07:43:59 2004
-+++ src/ptytty.c	Tue Jan 18 19:26:30 2005
-@@ -48,7 +48,6 @@
+--- vgseer/ptytty.c.orig	Mon Apr 25 18:21:55 2005
++++ vgseer/ptytty.c	Tue Sep  6 15:43:01 2005
+@@ -60,7 +60,6 @@
  # include <sys/ioctl.h>
  #endif
  #if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
@@ -8,7 +8,7 @@
  #endif
  
  
-@@ -71,6 +70,11 @@
+@@ -83,6 +82,11 @@
  rxvt_get_pty(int *fd_tty, const char **ttydev)
  {
      int             pfd;
diff --git a/shells/viewglob/pkg-plist b/shells/viewglob/pkg-plist
index f7ecde22a459..e7de648524cb 100644
--- a/shells/viewglob/pkg-plist
+++ b/shells/viewglob/pkg-plist
@@ -1,9 +1,12 @@
-bin/gviewglob
+bin/vgd
+bin/vgseer
 bin/viewglob
 lib/viewglob/.zshrc
+lib/viewglob/conf-to-args.sh
 lib/viewglob/getopt.sh
-lib/viewglob/glob-expand
-lib/viewglob/gviewglob
 lib/viewglob/init-viewglob.bashrc
-lib/viewglob/seer
+lib/viewglob/vgclassic
+lib/viewglob/vgexpand
+lib/viewglob/vgmini
+lib/viewglob/vgping
 @dirrm lib/viewglob