3 files changed, 92 insertions, 103 deletions

diff --git a/devel/libcii/Makefile b/devel/libcii/Makefile
index da289fda169a..d53102172634 100644
--- a/devel/libcii/Makefile
+++ b/devel/libcii/Makefile
@@ -13,69 +13,57 @@ DISTNAME=	cii11
 
 MAINTAINER=	ports@FreeBSD.org
 
-NO_INSTALL_MANPAGES=	yes
 NO_WRKSUBDIR=	yes
 
-SAMPLES=	double calc ids	mpcalc wf xref cref iref kref \
-		idents words basename dirname sort spin	sieve
+MAKEFILE=	makefile
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DMAXALIGH=8 -Iinclude" \
+		AS="${CC} -c -x assembler-with-cpp -traditional" \
+		LD="${CC}" LDFLAGS="" EXTRAS="" BUILDDIR=${PKGNAME}
+PLIST_SUB=	CIIMAJOR="${CIIMAJOR}"
 
 CIIBUILD=	${WRKDIR}/${PKGNAME}
-CIICUSTOM=	${FILESDIR}/freebsd.mk
 CIIMAJOR=	1
 CIIDEST=	${PREFIX}/lib/cii
 
-MAKEFILE=	makefile
-MAKE_FLAGS+=	BUILDDIR=${PKGNAME}	#	${CIIBUILD}
-MAKE_FLAGS+=	CUSTOM=${CIICUSTOM}
+SAMPLES=	double calc ids	mpcalc wf xref cref iref kref \
+		idents words basename dirname sort spin	sieve
 
 pre-build:
 	@${MKDIR} ${CIIBUILD}
 	@${MKDIR} ${CIIBUILD}/include
 	@${CP} ${WRKDIR}/include/*.h ${CIIBUILD}/include
 
-do-build:
-	@(cd ${WRKDIR}; ${MAKE} ${MAKE_FLAGS})
-
-# /usr/local/lib/cii/1/
-# /usr/local/lib/cii/1/include
+# ${PREFIX}/lib/cii/${CIIMAJOR}/
+# ${PREFIX}/lib/cii/${CIIMAJOR}/include
 #
-# libcii.a is placed in /usr/local/lib
-# .h is placed in	/usr/local/include/cii
+# libcii.a is placed in ${PREFIX}/lib
+# .h is placed in	${PREFIX}/include/cii
 #
 do-install:
 	@${MKDIR} ${CIIDEST}
 	@${MKDIR} ${CIIDEST}/${CIIMAJOR}
 	@${MKDIR} ${CIIDEST}/${CIIMAJOR}/include
 	@${MKDIR} ${CIIDEST}/${CIIMAJOR}/examples
-#	@${MKDIR} ${PREFIX}/include/cii
 ##
-	${INSTALL} ${COPY} ${CIIBUILD}/libcii.a ${CIIDEST}/${CIIMAJOR}
+	${INSTALL_DATA} ${CIIBUILD}/libcii.a ${CIIDEST}/${CIIMAJOR}
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${CIIDEST}/${CIIMAJOR}/include
 ##
-	${LN} -s ${CIIDEST}/${CIIMAJOR}/libcii.a ${PREFIX}/lib/libcii.a
-	${LN} -s ${CIIDEST}/${CIIMAJOR}/include ${PREFIX}/include/cii
+	${LN} -sf ${CIIDEST}/${CIIMAJOR}/libcii.a ${PREFIX}/lib/libcii.a
+	${LN} -sf ${CIIDEST}/${CIIMAJOR}/include ${PREFIX}/include/cii
 ##
-	(for a in ${SAMPLES}; \
-	do \
-	${INSTALL_PROGRAM} ${CIIBUILD}/$$a ${CIIDEST}/${CIIMAJOR}/examples; \
-	done)
+.for a in ${SAMPLES}
+	${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${CIIDEST}/${CIIMAJOR}/examples
+.endfor
 ##
-
-post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/cii
 	@${MKDIR} ${PREFIX}/share/doc/cii/examples
 	@${MKDIR} ${PREFIX}/share/doc/cii/src
-	${INSTALL_DATA} ${WRKSRC}/makefile ${PREFIX}/share/doc/cii
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cii
-	${INSTALL_DATA} ${WRKSRC}/history.html ${PREFIX}/share/doc/cii
-	${INSTALL_DATA} ${WRKSRC}/CPYRIGHT ${PREFIX}/share/doc/cii
-	${INSTALL_DATA} ${WRKSRC}/install.html ${PREFIX}/share/doc/cii
-	${INSTALL_DATA} ${WRKSRC}/packing.lst ${PREFIX}/share/doc/cii
-	${INSTALL_DATA} ${WRKSRC}/examples/* \
-		${PREFIX}/share/doc/cii/examples
-	${INSTALL_DATA} ${WRKSRC}/src/* \
-		${PREFIX}/share/doc/cii/src
+.for f in CPYRIGHT README history.html install.html makefile packing.lst
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/cii
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/doc/cii/examples
+	${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/share/doc/cii/src
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libcii/pkg-descr b/devel/libcii/pkg-descr
index ad825bb98464..c1697ee23042 100644
--- a/devel/libcii/pkg-descr
+++ b/devel/libcii/pkg-descr
@@ -1,4 +1,4 @@
-This hierarchy contains all the source code from my book
+This hierarchy contains all the source code from
 "C Interfaces and Implementations: Techniques for Creating Reusable
 Software (Addison-Wesley Professional Computing Series, 1997,
 ISBN 0-201-49841-3).
@@ -7,11 +7,10 @@ For installation instructions, see install.html.
 
 For a summary of the distribution's revision history, see history.html.
 
-For more information, visit http://www.cs.princeton.edu/software/cii/.
+WWW: http://www.cs.princeton.edu/software/cii/
 -----
-David R. Hanson
+Author: David R. Hanson
 drh@microsoft.com / http://www.research.microsoft.com/~drh/
-$FreeBSD$
 ---
 FreeBSD note: in /usr/local
 lib/libcii.a	->	lib/cii/1/libcii.a
diff --git a/devel/libcii/pkg-plist b/devel/libcii/pkg-plist
index 29bc3b3f532f..4995e531b759 100644
--- a/devel/libcii/pkg-plist
+++ b/devel/libcii/pkg-plist
@@ -1,52 +1,73 @@
-lib/cii/1/libcii.a
-lib/cii/1/include/ap.h
-lib/cii/1/include/arena.h
-lib/cii/1/include/arith.h
-lib/cii/1/include/array.h
-lib/cii/1/include/arrayrep.h
-lib/cii/1/include/assert.h
-lib/cii/1/include/atom.h
-lib/cii/1/include/bit.h
-lib/cii/1/include/chan.h
-lib/cii/1/include/except.h
-lib/cii/1/include/fmt.h
-lib/cii/1/include/list.h
-lib/cii/1/include/mem.h
-lib/cii/1/include/mp.h
-lib/cii/1/include/ring.h
-lib/cii/1/include/sem.h
-lib/cii/1/include/seq.h
-lib/cii/1/include/set.h
-lib/cii/1/include/stack.h
-lib/cii/1/include/str.h
-lib/cii/1/include/table.h
-lib/cii/1/include/text.h
-lib/cii/1/include/thread.h
-lib/cii/1/include/xp.h
-lib/cii/1/examples/double
-lib/cii/1/examples/calc
-lib/cii/1/examples/ids
-lib/cii/1/examples/mpcalc
-lib/cii/1/examples/wf
-lib/cii/1/examples/xref
-lib/cii/1/examples/cref
-lib/cii/1/examples/iref
-lib/cii/1/examples/kref
-lib/cii/1/examples/idents
-lib/cii/1/examples/words
-lib/cii/1/examples/basename
-lib/cii/1/examples/dirname
-lib/cii/1/examples/sort
-lib/cii/1/examples/spin
-lib/cii/1/examples/sieve
-@dirrm lib/cii/1/include
-@dirrm lib/cii/1/examples
-@dirrm lib/cii/1
+lib/cii/%%CIIMAJOR%%/examples/double
+lib/cii/%%CIIMAJOR%%/examples/calc
+lib/cii/%%CIIMAJOR%%/examples/ids
+lib/cii/%%CIIMAJOR%%/examples/mpcalc
+lib/cii/%%CIIMAJOR%%/examples/wf
+lib/cii/%%CIIMAJOR%%/examples/xref
+lib/cii/%%CIIMAJOR%%/examples/cref
+lib/cii/%%CIIMAJOR%%/examples/iref
+lib/cii/%%CIIMAJOR%%/examples/kref
+lib/cii/%%CIIMAJOR%%/examples/idents
+lib/cii/%%CIIMAJOR%%/examples/words
+lib/cii/%%CIIMAJOR%%/examples/basename
+lib/cii/%%CIIMAJOR%%/examples/dirname
+lib/cii/%%CIIMAJOR%%/examples/sort
+lib/cii/%%CIIMAJOR%%/examples/spin  
+lib/cii/%%CIIMAJOR%%/examples/sieve
+lib/cii/%%CIIMAJOR%%/include/ap.h
+lib/cii/%%CIIMAJOR%%/include/arena.h
+lib/cii/%%CIIMAJOR%%/include/arith.h
+lib/cii/%%CIIMAJOR%%/include/array.h
+lib/cii/%%CIIMAJOR%%/include/arrayrep.h
+lib/cii/%%CIIMAJOR%%/include/assert.h
+lib/cii/%%CIIMAJOR%%/include/atom.h
+lib/cii/%%CIIMAJOR%%/include/bit.h
+lib/cii/%%CIIMAJOR%%/include/chan.h
+lib/cii/%%CIIMAJOR%%/include/except.h
+lib/cii/%%CIIMAJOR%%/include/fmt.h
+lib/cii/%%CIIMAJOR%%/include/list.h
+lib/cii/%%CIIMAJOR%%/include/mem.h
+lib/cii/%%CIIMAJOR%%/include/mp.h
+lib/cii/%%CIIMAJOR%%/include/ring.h
+lib/cii/%%CIIMAJOR%%/include/sem.h
+lib/cii/%%CIIMAJOR%%/include/seq.h
+lib/cii/%%CIIMAJOR%%/include/set.h
+lib/cii/%%CIIMAJOR%%/include/stack.h
+lib/cii/%%CIIMAJOR%%/include/str.h
+lib/cii/%%CIIMAJOR%%/include/table.h
+lib/cii/%%CIIMAJOR%%/include/text.h
+lib/cii/%%CIIMAJOR%%/include/thread.h
+lib/cii/%%CIIMAJOR%%/include/xp.h
+lib/cii/%%CIIMAJOR%%/libcii.a
+@dirrm lib/cii/%%CIIMAJOR%%/include
+@dirrm lib/cii/%%CIIMAJOR%%/examples
+@dirrm lib/cii/%%CIIMAJOR%%
 @dirrm lib/cii
-@unexec /bin/rm /usr/local/lib/libcii.a
-@unexec /bin/rm /usr/local/include/cii
+@unexec /bin/rm %D/lib/libcii.a
+@unexec /bin/rm %D/include/cii
+@exec /bin/ln -sf %D/lib/cii/%%CIIMAJOR%%/include %D/include/cii
+@exec /bin/ln -sf %D/lib/cii/%%CIIMAJOR%%/libcii.a %D/lib/libcii.a
 share/doc/cii/CPYRIGHT
 share/doc/cii/README
+share/doc/cii/examples/basename.c
+share/doc/cii/examples/calc.c
+share/doc/cii/examples/cref.c
+share/doc/cii/examples/double.c
+share/doc/cii/examples/getword.c
+share/doc/cii/examples/getword.h
+share/doc/cii/examples/idents.c
+share/doc/cii/examples/ids.c
+share/doc/cii/examples/integer.c
+share/doc/cii/examples/integer.h
+share/doc/cii/examples/iref.c
+share/doc/cii/examples/kref.c
+share/doc/cii/examples/mpcalc.c
+share/doc/cii/examples/sieve.c
+share/doc/cii/examples/sort.c 
+share/doc/cii/examples/spin.c
+share/doc/cii/examples/wf.c  
+share/doc/cii/examples/words.c
+share/doc/cii/examples/xref.c
 share/doc/cii/history.html
 share/doc/cii/install.html
 share/doc/cii/makefile
@@ -83,25 +104,6 @@ share/doc/cii/src/thread-nt.c
 share/doc/cii/src/thread.c
 share/doc/cii/src/thread.c.orig
 share/doc/cii/src/xp.c
-share/doc/cii/examples/basename.c
-share/doc/cii/examples/calc.c
-share/doc/cii/examples/cref.c
-share/doc/cii/examples/double.c
-share/doc/cii/examples/getword.c
-share/doc/cii/examples/getword.h
-share/doc/cii/examples/idents.c
-share/doc/cii/examples/ids.c
-share/doc/cii/examples/integer.c
-share/doc/cii/examples/integer.h
-share/doc/cii/examples/iref.c
-share/doc/cii/examples/kref.c
-share/doc/cii/examples/mpcalc.c
-share/doc/cii/examples/sieve.c
-share/doc/cii/examples/sort.c
-share/doc/cii/examples/spin.c
-share/doc/cii/examples/wf.c
-share/doc/cii/examples/words.c
-share/doc/cii/examples/xref.c
 @dirrm share/doc/cii/src
 @dirrm share/doc/cii/examples
 @dirrm share/doc/cii