3 files changed, 79 insertions, 43 deletions

diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index 8bde5941c9a9..6a98b12cf648 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -13,27 +13,18 @@ DISTFILES=	objc-bootstrap-${PORTVERSION}.tar.gz objc-${PORTVERSION}.tar.gz
 
 MAINTAINER=	chuckr@freebsd.org
 
-#BUILD_DEPENDS=	$(PREFIX)/lib/libgc.a:$(PORTSDIR)/devel/boehm-gc
-
 HAS_CONFIGURE=	yes
-MAN1=		cvtimport.1 objc.1 postlink.1 vici.1
-MAN3=		Array.3 AsciiFiler.3 Bag.3 Block.3 CAObject.3 Cltn.3 \
-		Complex.3 Dictionary.3 Float.3 Fraction.3 IdArray.3 IntArray.3\
-		BigInt.3 IntegerModp.3 Matrix.3 Message.3 Monomial.3 Object.3\
-		OrdCltn.3 Paragraph.3 Point.3 Polynomial.3 Rectangle.3 \
-		RunArray.3 Set.3 Sequence.3 SortCltn.3 Stack.3 String.3 \
-		Symbol.3 Term.3 Text.3 TextAttribute.3 TextStyle.3 Vector.3
-
-ALL_TARGET=	compiler
+
+ALL_TARGET=	default
 MAKE_ENV=	PATH=$(WRKDIR)/bin:$(PATH)
 CONFIGURE_ENV=	PATH=$(WRKDIR)/bin:$(PATH)
 CONFIGURE_ARGS=	--prefix=$(PREFIX)
-#CONFIGURE_ARGS=	--prefix=$(PREFIX) --gcprefix=$(PREFIX)
 
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	(cd $(WRKDIR)/${PORTNAME}-bootstrap-$(PORTVERSION);./configure --prefix=$(WRKDIR);${MAKE};${MAKE} install)
+	cd $(WRKDIR)/${PORTNAME}-bootstrap-$(PORTVERSION);\
+	./configure --prefix=$(WRKDIR);${MAKE};${MAKE} install
 
 pre-install:
 	$(MKDIR) $(PREFIX)/share/doc/objc
@@ -42,4 +33,6 @@ pre-install:
 	${TAR} -cf - -C $(WRKSRC)/examples . | ${TAR} xpf - -C $(PREFIX)/share/doc/objc/examples
 	${TAR} -cf - -C $(WRKSRC)/html . | ${TAR} xpf - -C $(PREFIX)/share/doc/objc/html
 
+.include "${FILESDIR}/manpages.mk"
+
 .include <bsd.port.post.mk>
diff --git a/lang/objc/files/manpages.mk b/lang/objc/files/manpages.mk
new file mode 100644
index 000000000000..ad7026883e6e
--- /dev/null
+++ b/lang/objc/files/manpages.mk
@@ -0,0 +1,39 @@
+MAN1+=		cvtimport.1
+MAN1+=		objc.1
+MAN1+=		postlink.1
+MAN1+=		vici.1
+MAN3+=		AsciiFiler.3
+MAN3+=		Array.3
+MAN3+=		BigInt.3
+MAN3+=		Bag.3
+MAN3+=		CAObject.3
+MAN3+=		Block.3
+MAN3+=		Complex.3
+MAN3+=		Cltn.3
+MAN3+=		Dictionary.3
+MAN3+=		Float.3
+MAN3+=		Fraction.3
+MAN3+=		IdArray.3
+MAN3+=		IntArray.3
+MAN3+=		IntegerModp.3
+MAN3+=		Matrix.3
+MAN3+=		Message.3
+MAN3+=		Monomial.3
+MAN3+=		Object.3
+MAN3+=		OrdCltn.3
+MAN3+=		Paragraph.3
+MAN3+=		Point.3
+MAN3+=		Polynomial.3
+MAN3+=		Rectangle.3
+MAN3+=		RunArray.3
+MAN3+=		Set.3
+MAN3+=		Sequence.3
+MAN3+=		SortCltn.3
+MAN3+=		Stack.3
+MAN3+=		String.3
+MAN3+=		Symbol.3
+MAN3+=		Term.3
+MAN3+=		Text.3
+MAN3+=		TextAttribute.3
+MAN3+=		TextStyle.3
+MAN3+=		Vector.3
diff --git a/lang/objc/pkg-plist b/lang/objc/pkg-plist
index ca1e20e5e0b8..6ee65b8939a0 100644
--- a/lang/objc/pkg-plist
+++ b/lang/objc/pkg-plist
@@ -1,13 +1,7 @@
+bin/cvtimport
 bin/objc
 bin/objc1
 bin/postlink
-bin/cvtimport
-lib/objcrt.a
-lib/objpak.a
-lib/_prelink.o
-lib/_predll.o
-lib/objchelp.txt
-lib/objcdlso.ld
 include/cakit/cakit.h
 include/cakit/ccltn.h
 include/cakit/ccomplex.h
@@ -24,31 +18,31 @@ include/cakit/symbol.h
 include/cakit/term.h
 include/cakit/vector.h
 include/objcrt/Block.h
-include/objcrt/Object.h
 include/objcrt/Message.h
-include/objcrt/objcrt.h
+include/objcrt/Object.h
 include/objcrt/objc.h
+include/objcrt/objcrt.h
+include/objpak/array.h
 include/objpak/ascfiler.h
+include/objpak/bag.h
+include/objpak/cltn.h
 include/objpak/dictnary.h
-include/objpak/ocstring.h
+include/objpak/idarray.h
+include/objpak/intarray.h
 include/objpak/objpak.h
-include/objpak/cltn.h
+include/objpak/ocstring.h
+include/objpak/octext.h
 include/objpak/ordcltn.h
+include/objpak/paragrph.h
+include/objpak/point.h
+include/objpak/rectangl.h
+include/objpak/runarray.h
+include/objpak/sequence.h
 include/objpak/set.h
-include/objpak/bag.h
 include/objpak/sortcltn.h
 include/objpak/stack.h
-include/objpak/runarray.h
-include/objpak/array.h
-include/objpak/idarray.h
-include/objpak/intarray.h
 include/objpak/txtattr.h
-include/objpak/point.h
-include/objpak/rectangl.h
-include/objpak/octext.h
-include/objpak/paragrph.h
 include/objpak/txtstyle.h
-include/objpak/sequence.h
 include/oclib/addrof.h
 include/oclib/arrowxpr.h
 include/oclib/arydecl.h
@@ -142,16 +136,26 @@ include/ppi/String.h
 include/ppi/StringCl.h
 include/ppi/mivarargs.h
 include/ppi/vectors.h
+lib/_predll.o
+lib/_prelink.o
+lib/cakit.a
+lib/cakitr.a
+lib/objcdlso.ld
+lib/objchelp.txt
+lib/objcrt.a
+lib/objcrtr.a
+lib/objpak.a
+lib/objpakr.a
+share/doc/objc/examples/Makefile
 share/doc/objc/examples/Makefile.in
 share/doc/objc/examples/README
-share/doc/objc/examples/loop.m
 share/doc/objc/examples/all.m
 share/doc/objc/examples/assoc.m
 share/doc/objc/examples/become.m
 share/doc/objc/examples/block.m
+share/doc/objc/examples/blrefcnt.m
 share/doc/objc/examples/blvar.m
 share/doc/objc/examples/classvars.m
-share/doc/objc/examples/blrefcnt.m
 share/doc/objc/examples/delegate.m
 share/doc/objc/examples/dlopen.m
 share/doc/objc/examples/during.h
@@ -162,6 +166,7 @@ share/doc/objc/examples/except.m
 share/doc/objc/examples/gdb.m
 share/doc/objc/examples/howmany.m
 share/doc/objc/examples/ifExcept.m
+share/doc/objc/examples/loop.m
 share/doc/objc/examples/memory.m
 share/doc/objc/examples/nextinst.m
 share/doc/objc/examples/poseAs.m
@@ -173,7 +178,6 @@ share/doc/objc/examples/super.m
 share/doc/objc/examples/tail.m
 share/doc/objc/examples/timeblock.m
 share/doc/objc/examples/varscope.m
-share/doc/objc/examples/Makefile
 share/doc/objc/html/cakit/BigInt.html
 share/doc/objc/html/cakit/CAObject.html
 share/doc/objc/html/cakit/Complex.html
@@ -209,14 +213,14 @@ share/doc/objc/html/objpak/String.html
 share/doc/objc/html/objpak/Text.html
 share/doc/objc/html/objpak/TextAttribute.html
 share/doc/objc/html/objpak/TextStyle.html
-@dirrm share/doc/objc/examples
-@dirrm share/doc/objc/html/cakit
-@dirrm share/doc/objc/html/objcrt
 @dirrm share/doc/objc/html/objpak
+@dirrm share/doc/objc/html/objcrt
+@dirrm share/doc/objc/html/cakit
 @dirrm share/doc/objc/html
+@dirrm share/doc/objc/examples
 @dirrm share/doc/objc
-@dirrm include/cakit
+@dirrm include/ppi
 @dirrm include/oclib
-@dirrm include/objcrt
 @dirrm include/objpak
-@dirrm include/ppi
+@dirrm include/objcrt
+@dirrm include/cakit