Index: converters/chmview/Makefile
@@ -6,28 +6,28 @@
 #
 
 PORTNAME=	chmview
-DISTVERSION=	2.0b3
-PORTREVISION=	1
+DISTVERSION=	2.0b4
 CATEGORIES=	converters textproc
-MASTER_SITES=	SF/trexinc/CHMView/2.0%20beta%203
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	CHMView_${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	spam@rm-rf.kiev.ua
 COMMENT=	Extractor from .chm files
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	chm:${PORTSDIR}/misc/chmlib
+
+PROJECTHOST=	ak-various-projects
+
+USE_XZ=		yes
+USE_DOS2UNIX=	chmview.c utf8.c utf8.h
 
 WRKSRC=		${WRKDIR}/src
 PLIST_FILES=	bin/chmview
 MAKE_JOBS_SAFE=	yes
 
-ONLY_FOR_ARCHS=	i386 amd64
-
 pre-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/chmview ${PREFIX}/bin/
-
 .include <bsd.port.mk>
Index: converters/chmview/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CHMView_2.0b3.zip) = d9cd81b1f5a1851e2ea47f6e6b7dd6ba76578fcd26c8d636df2d80be4a050adf
-SIZE (CHMView_2.0b3.zip) = 50891
+SHA256 (CHMView_2.0b4.tar.xz) = 122d6d3f027a0ff3070d61aa3245d3091788ac6bd3fd506b41aaae53c401b910
+SIZE (CHMView_2.0b4.tar.xz) = 30528
Index: converters/chmview/files/Makefile
@@ -1,27 +1,14 @@
-#
-# $FreeBSD: ports/converters/chmview/files/Makefile,v 1.3 2007/03/05 12:15:12 rafan Exp $
-#
-OBJDIR = .
-EXEDIR = .
-EXENAME = $(EXEDIR)/chmview
-
-CFLAGS += -DUNIX
-
-all: $(EXENAME)
-
-OBJS = $(OBJDIR)/chmview.o \
-       $(OBJDIR)/chm_lib.o \
-       $(OBJDIR)/lzx.o \
-       $(OBJDIR)/utf8.o
-
-$(OBJDIR)/chmview.o: chmview.c chm_lib.h
-$(OBJDIR)/chm_lib.o: chm_lib.c chm_lib.h lzx.h
-$(OBJDIR)/utf8.o: utf8.c utf8.h
-$(OBJDIR)/lzx.o: lzx.c lzx.h
-
-.c.o:
-	$(CC) $(CFLAGS) -c ${.IMPSRC}
-
-$(EXENAME): $(OBJS)
-	echo $(OBJS)
-	$(CC) $(LFLAGS) -o $(EXENAME) ${.ALLSRC}
+BINDIR?=	${PREFIX}/bin
+
+CFLAGS+=	-DUNIX -I${LOCALBASE}/include
+LDADD+=		-L${LOCALBASE}/lib -lchm
+
+WARNS?=		6
+
+NO_MAN=		yes
+
+PROG=		chmview
+
+SRCS=		chmview.c utf8.h utf8.c
+
+.include <bsd.prog.mk>