4 files changed, 61 insertions, 43 deletions

diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index e81c6a634e1e..8e1869e4dd0a 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gpc
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://agnes.dida.physik.uni-essen.de/gnu-pascal/beta/
 DISTNAME=	gpc-19990118
@@ -22,6 +23,7 @@ ALL_TARGET=	bootstrap
 INSTALL_TARGET=	pascal.install
 
 MAN1=		gpc.1
+MLINKS=		gpc.1 bpc.1 gpc.1 epc.1 gpc.1 pc.1
 
 .include <bsd.port.pre.mk>
 
@@ -33,4 +35,10 @@ CONFIGURE_ARGS=	--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/in
 post-extract:
 	@(${CP} -R ${WRKDIRPREFIX}${.CURDIR}/../../lang/gcc28/work/gcc-2.8.1/* ${WRKSRC})
 
+pre-install:
+	@${RM} -f ${WRKSRC}/p/doc/gpc.info*
+
+post-install:
+	install-info ${PREFIX}/info/gpc.info ${PREFIX}/info/dir
+
 .include <bsd.port.post.mk>
diff --git a/lang/gpc/files/patch-at b/lang/gpc/files/patch-at
new file mode 100644
index 000000000000..73d872b5e2b3
--- /dev/null
+++ b/lang/gpc/files/patch-at
@@ -0,0 +1,20 @@
+--- p/Make-lang.in.orig	Tue Jan 19 02:10:16 1999
++++ p/Make-lang.in	Mon Jan  1 07:30:02 2001
+@@ -42,7 +42,7 @@
+ HARDLINK=ln
+ 
+ # Where to install the demos (relative to the prefix)
+-DEMO_DIR=doc/gpc/demos
++DEMO_DIR=share/doc/gpc/demos
+ demodir=$(prefix)/$(DEMO_DIR)
+ 
+ # Analogous to objext
+@@ -281,7 +281,7 @@
+ p/doc/gpc.info: $(GPC_TEXI) p/doc/gpcpas.texi
+ 	if [ -d p/doc ]; then true; else mkdir p/doc; fi
+ 	src=`cd $(srcdir); pwd`; \
+-	cd p/doc; $(MAKEINFO) -I$${src}/p/doc -o gpc.info $${src}/p/doc/gpc.texi
++	cd p/doc; $(MAKEINFO) --no-split -I$${src}/p/doc -o gpc.info $${src}/p/doc/gpc.texi
+ 
+ p/doc/gpc.dvi: $(GPC_TEXI) p/doc/gpcpas.texi
+ 	if [ -d p/doc ]; then true; else mkdir p/doc; fi
diff --git a/lang/gpc/files/patch-au b/lang/gpc/files/patch-au
new file mode 100644
index 000000000000..755ef1fafdf5
--- /dev/null
+++ b/lang/gpc/files/patch-au
@@ -0,0 +1,13 @@
+--- p/doc/gpc.texi.orig	Tue Jul  7 00:21:41 1998
++++ p/doc/gpc.texi	Mon Jan  1 07:17:33 2001
+@@ -23,6 +23,10 @@
+ @c Header.
+ 
+ @setfilename gpc.info
++@dircategory Programming
++@direntry
++* GPC: (gpc).			The GNU Pascal Compiler.
++@end direntry
+ @c @setfilename usegpc.info
+ @c @setfilename hackgpc.info
+ @c To produce the full manual, use the "gpc.info" setfilename, and
diff --git a/lang/gpc/pkg-plist b/lang/gpc/pkg-plist
index c7f2f14e1660..d40c64e5b805 100644
--- a/lang/gpc/pkg-plist
+++ b/lang/gpc/pkg-plist
@@ -1,7 +1,12 @@
+bin/bpc
+bin/epc
 bin/gpc
+bin/pc
 lib/gcc-lib/%%GNUHOST%%/2.8.1/gpc-cpp
 lib/gcc-lib/%%GNUHOST%%/2.8.1/gpc1
+lib/gcc-lib/%%GNUHOST%%/2.8.1/libgcc.a
 lib/gcc-lib/%%GNUHOST%%/2.8.1/libgpc.a
+lib/gcc-lib/%%GNUHOST%%/2.8.1/specs
 lib/gcc-lib/%%GNUHOST%%/2.8.1/units/crt.inc
 lib/gcc-lib/%%GNUHOST%%/2.8.1/units/crt.pas
 lib/gcc-lib/%%GNUHOST%%/2.8.1/units/crtc.c
@@ -35,49 +40,21 @@ lib/gcc-lib/%%GNUHOST%%/2.8.1/units/strings.pas
 lib/gcc-lib/%%GNUHOST%%/2.8.1/units/system.pas
 lib/gcc-lib/%%GNUHOST%%/2.8.1/units/turbo3.pas
 lib/gcc-lib/%%GNUHOST%%/2.8.1/units/windos.pas
+@unexec rmdir %D/lib/gcc-lib/%%GNUHOST%%/2.8.1/units 2>/dev/null || true
+@unexec rmdir %D/lib/gcc-lib/%%GNUHOST%%/2.8.1 2>/dev/null || true
+@unexec rmdir %D/lib/gcc-lib/%%GNUHOST%% 2>/dev/null || true
+@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true
+share/doc/gpc/demos/demoproc.pas
+share/doc/gpc/demos/factorial.pas
+share/doc/gpc/demos/getoptdemo.pas
+share/doc/gpc/demos/pexecutedemo.pas
+share/doc/gpc/demos/pi.pas
+share/doc/gpc/demos/pipedemo.pas
+share/doc/gpc/demos/portdemo.pas
+share/doc/gpc/demos/power.pas
+share/doc/gpc/demos/regexdemo.pas
+@dirrm share/doc/gpc/demos
+@dirrm share/doc/gpc
 @unexec install-info --delete %D/info/gpc.info %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-1 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-10 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-11 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-12 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-13 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-14 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-2 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-3 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-4 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-5 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-6 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-7 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-8 %D/info/dir
-@unexec install-info --delete %D/info/gpc.info-9 %D/info/dir
 info/gpc.info
-info/gpc.info-1
-info/gpc.info-10
-info/gpc.info-11
-info/gpc.info-12
-info/gpc.info-13
-info/gpc.info-14
-info/gpc.info-2
-info/gpc.info-3
-info/gpc.info-4
-info/gpc.info-5
-info/gpc.info-6
-info/gpc.info-7
-info/gpc.info-8
-info/gpc.info-9
-@dirrm lib/gcc-lib/%%GNUHOST%%/2.8.1/units
 @exec install-info %D/info/gpc.info %D/info/dir
-@exec install-info %D/info/gpc.info-1 %D/info/dir
-@exec install-info %D/info/gpc.info-10 %D/info/dir
-@exec install-info %D/info/gpc.info-11 %D/info/dir
-@exec install-info %D/info/gpc.info-12 %D/info/dir
-@exec install-info %D/info/gpc.info-13 %D/info/dir
-@exec install-info %D/info/gpc.info-14 %D/info/dir
-@exec install-info %D/info/gpc.info-2 %D/info/dir
-@exec install-info %D/info/gpc.info-3 %D/info/dir
-@exec install-info %D/info/gpc.info-4 %D/info/dir
-@exec install-info %D/info/gpc.info-5 %D/info/dir
-@exec install-info %D/info/gpc.info-6 %D/info/dir
-@exec install-info %D/info/gpc.info-7 %D/info/dir
-@exec install-info %D/info/gpc.info-8 %D/info/dir
-@exec install-info %D/info/gpc.info-9 %D/info/dir