4 files changed, 31 insertions, 27 deletions

diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index f8ebc9e43514..8f33ad52bc0a 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -17,21 +17,18 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A static source code checker for C++
 
 USE_PYTHON=	yes
-USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+INFO=		clint
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
-
-post-install:
-	@install-info ${PREFIX}/info/clint.info ${PREFIX}/info/dir
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-pedantic||g ; \
+		 s|-ldl||g'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/clint/files/patch-doc::clint.texi b/devel/clint/files/patch-doc::clint.texi
new file mode 100644
index 000000000000..b9518187f08e
--- /dev/null
+++ b/devel/clint/files/patch-doc::clint.texi
@@ -0,0 +1,21 @@
+--- doc/clint.texinfo.orig	Tue Apr 17 04:52:44 2001
++++ doc/clint.texinfo	Sat Oct 18 21:02:43 2003
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename clint.info
+ @settitle Clint is a static source code checker for C++
++@dircategory Programming & development tools
++@direntry
++* Clint: (clint).		A static source code checker for C++
++@end direntry
+ @finalout
+ @setchapternewpage odd
+ @c %**end of header
+@@ -94,7 +98,6 @@
+ professional experience.)
+ 
+ @node Copying, Overview, Instructions, Top
+-@include gpl.texinfo
+ 
+ @node Overview, Sample, Copying, Top
+ @chapter Overview
diff --git a/devel/clint/files/patch-src::Makefile.in b/devel/clint/files/patch-src::Makefile.in
deleted file mode 100644
index 2f8ccaf959f3..000000000000
--- a/devel/clint/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue May  1 16:52:17 2001
-+++ src/Makefile.in	Tue May  1 16:52:26 2001
-@@ -107,7 +107,7 @@
- 
- CXXFLAGS = -Wall -pedantic -ansi -W @CXXFLAGS@ -DPKGLIBDIR="\"$(pkglibdir)\""
- bin_PROGRAMS = clint
--clint_LDFLAGS = -ldl -rdynamic
-+clint_LDFLAGS = -rdynamic
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/clint/pkg-plist b/devel/clint/pkg-plist
index 62dfbd211521..fdc9ce98a467 100644
--- a/devel/clint/pkg-plist
+++ b/devel/clint/pkg-plist
@@ -1,17 +1,12 @@
 bin/clint
 include/clint/exceptions.h
 include/clint/python.h
-@dirrm include/clint
-@unexec install-info --delete %D/info/clint.info %D/info/dir
-info/clint.info
-@exec install-info %D/info/clint.info %D/info/dir
 lib/clint/python.a
 lib/clint/python.so
 lib/clint/python.so.0
 lib/libpython++.a
 lib/libpython++.so
 lib/libpython++.so.0
-@dirrm lib/clint
 share/clint/clint.py
 share/clint/python_rules/c_comments.py
 share/clint/python_rules/catch_exception.py
@@ -22,3 +17,5 @@ share/clint/python_rules/macros.py
 share/clint/python_rules/shortcut_if.py
 @dirrm share/clint/python_rules
 @dirrm share/clint
+@dirrm lib/clint
+@dirrm include/clint