cint: Normalize man-pages handling

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Sep 28 11:41:05 2016 +0200
Changeset:	b1a7f9528bf1979c87e78fd5b3c5f9dedb5d6cb1

Modified Files:
	cint/Makefile
	cint/PLIST

Log Message:
cint: Normalize man-pages handling

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b1a7f9528bf1979c87e78fd5b3c5f9dedb5d6cb1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cint/Makefile | 14 +++++++++-----
 cint/PLIST    | 16 ++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diffs:
diff --git a/cint/Makefile b/cint/Makefile
index 8670a70..626a086 100644
--- a/cint/Makefile
+++ b/cint/Makefile
@@ -38,8 +38,7 @@ BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/cint/lib
 BUILD_TARGET=			# empty string required (override "all")
 
 INSTALLATION_DIRS+=	bin cint cint/lib share/doc/cint
-INSTALLATION_DIRS+=	${PKGMANDIR}/man1cint ${PKGMANDIR}/man2cint
-INSTALLATION_DIRS+=	${PKGMANDIR}/man3cint
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3
 
 post-extract:
 	${FIND} ${WRKSRC} -depth -type d -name CVS -exec ${RM} -rf {} \;
@@ -74,10 +73,15 @@ do-install:
 		${DESTDIR}${PREFIX}/share/doc/cint
 .endfor
 .for f in \
-	cint.1 makecint.1 garbage.2 security.2 unique.2 array.h.3 fft.h.3 \
-	statistics.h.3
+	cint.1 makecint.1 garbage.2 unique.2 array.h.3 fft.h.3 statistics.h.3
 	${INSTALL_MAN} ${WRKSRC}/doc/man${f:E}/${f} \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man${f:E}cint/${f}cint
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man${f:E}/${f}
+.endfor
+# Resolve conflict with devel/man-pages
+.for f in \
+	security.2
+	${INSTALL_MAN} ${WRKSRC}/doc/man${f:E}/${f} \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man${f:E}/cint_${f}
 .endfor
 
 
diff --git a/cint/PLIST b/cint/PLIST
index d51240d..6d03303 100644
--- a/cint/PLIST
+++ b/cint/PLIST
@@ -569,14 +569,14 @@ cint/stl/utility.h
 cint/stl/valarray
 cint/stl/vector
 cint/stl/vector.h
-man/man1cint/cint.1cint
-man/man1cint/makecint.1cint
-man/man2cint/garbage.2cint
-man/man2cint/security.2cint
-man/man2cint/unique.2cint
-man/man3cint/array.h.3cint
-man/man3cint/fft.h.3cint
-man/man3cint/statistics.h.3cint
+man/man1/cint.1
+man/man1/makecint.1
+man/man2/cint_security.2
+man/man2/garbage.2
+man/man2/unique.2
+man/man3/array.h.3
+man/man3/fft.h.3
+man/man3/statistics.h.3
 share/doc/cint/bytecode.txt
 share/doc/cint/cint.txt
 share/doc/cint/cintapi.txt