3 files changed, 31 insertions, 34 deletions

diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 150800f2bbd2..18dd97b45f2b 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -6,60 +6,36 @@
 #
 
 PORTNAME=	cvsgraph
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.5.2
+PORTREVISION=	0
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Graph the life story of a file under CVS or RCS
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		cvsgraph.1
 MAN5=		cvsgraph.conf.5
 
-USE_BISON=	yes
-ALL_TARGET=	cvsgraph
 DOCDIR=		share/doc/${PORTNAME}
 DOCS=		ChangeLog LICENSE README
 EXAMPLES=	cvsgraphwrapper.php3 mkimage.php3
-ONLY_FOR_ARCHS=	i386
+MORE_EXAMPLES=	README.Automatic_documentation checkoutlist commit_action.sh \
+		commitinfo cvswrappers tag_action.sh taginfo
 PLIST=		${WRKDIR}/pkg-plist
-USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-freetype2-inc=${X11BASE}/include/freetype2/freetype \
-		--with-freetype2-lib=${X11BASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include \
-		--with-gd-lib=${LOCALBASE}/lib \
-		--with-jpeg-inc=${LOCALBASE}/include \
-		--with-jpeg-lib=${LOCALBASE}/lib \
-		--with-png-inc=${LOCALBASE}/include \
-		--with-png-lib=${LOCALBASE}/lib \
-		--with-z-inc=/usr/include \
-		--with-z-lib=/usr/lib \
-		--with-freetype2 \
-		--with-gd \
-		--with-jpeg \
-		--with-png \
-		--with-z
+CONFIGURE_ARGS=	--with-gd-inc=${LOCALBASE}/include \
+		--with-gd-lib=${LOCALBASE}/lib
 
 pre-patch:
-	${RM} ${WRKSRC}/configure # Avoid having to read this file.
 	${MV} ${WRKSRC}/cvsgraph.conf ${WRKSRC}/cvsgraph.conf.orig
 	${SED} -e "s:/home/bertho/tmp/cvstest:/home/ncvs:g" \
 		< ${WRKSRC}/cvsgraph.conf.orig > ${WRKSRC}/cvsgraph.conf
 
-post-configure:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
-	${SED} -e "s|CFLAGS	=|CFLAGS += -I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/gd|g" \
-		< ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
-
 pre-install:
 	${ECHO_CMD} bin/cvsgraph > ${PLIST}
 	${ECHO_CMD} etc/cvsgraph.conf >> ${PLIST}
@@ -67,9 +43,13 @@ pre-install:
 .for i in ${DOCS}
 	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
 .endfor
+.for i in ${MORE_EXAMPLES}
+	${ECHO_CMD} share/examples/${PORTNAME}/automatic_documentation/${i} >> ${PLIST}
+.endfor
 .for i in ${EXAMPLES}
 	${ECHO_CMD} share/examples/${PORTNAME}/${i} >> ${PLIST}
 .endfor
+	${ECHO_CMD} @dirrm share/examples/${PORTNAME}/automatic_documentation >> ${PLIST}
 	${ECHO_CMD} @dirrm share/examples/${PORTNAME} >> ${PLIST}
 	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
@@ -82,11 +62,15 @@ do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCDIR}
 	${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
+	${MKDIR} ${PREFIX}/share/examples/${PORTNAME}/automatic_documentation
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
 .endfor
 .for i in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${PREFIX}/share/examples/${PORTNAME}
+.endfor
+.for i in ${MORE_EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/contrib/automatic_documentation/${i} ${PREFIX}/share/examples/${PORTNAME}/automatic_documentation
 .endfor
 .endif
 
diff --git a/devel/cvsgraph/distinfo b/devel/cvsgraph/distinfo
index 625cff1f82e1..be5b3075a8a0 100644
--- a/devel/cvsgraph/distinfo
+++ b/devel/cvsgraph/distinfo
@@ -1,2 +1,2 @@
-MD5 (cvsgraph-1.4.0.tar.gz) = 706f0af002424712feb5b8c8406dcce8
-SIZE (cvsgraph-1.4.0.tar.gz) = 72321
+MD5 (cvsgraph-1.5.2.tar.gz) = 095a779d7977ae0c12f456ed119af6f6
+SIZE (cvsgraph-1.5.2.tar.gz) = 106382
diff --git a/devel/cvsgraph/files/patch-cvsgraph.c b/devel/cvsgraph/files/patch-cvsgraph.c
new file mode 100644
index 000000000000..fd0765853485
--- /dev/null
+++ b/devel/cvsgraph/files/patch-cvsgraph.c
@@ -0,0 +1,13 @@
+--- cvsgraph.c.orig	Wed Jun 15 05:36:59 2005
++++ cvsgraph.c	Wed Sep 21 11:06:22 2005
+@@ -191,8 +191,8 @@
+ {
+ 	printf("%sdtext.rev  : ", p);
+ 	dump_rev("", d->rev);
+-	printf("%sdtext.log  : %d bytes\n", p, d->log ? strlen(d->log) : -1);
+-	printf("%sdtext.text : %d bytes\n", p, d->text ? strlen(d->text) : -1);
++	printf("%sdtext.log  : %ld bytes\n", p, d->log ? (long) strlen(d->log) : -1);
++	printf("%sdtext.text : %ld bytes\n", p, d->text ? (long) strlen(d->text) : -1);
+ 	printf("\n");
+ }
+