3 files changed, 43 insertions, 56 deletions

diff --git a/lang/Gofer/Makefile b/lang/Gofer/Makefile
index 5a4218e3d2a1..30414197c1da 100644
--- a/lang/Gofer/Makefile
+++ b/lang/Gofer/Makefile
@@ -11,10 +11,15 @@ CATEGORIES=	lang
 MASTER_SITES=	http://www.cse.ogi.edu/~mpj/goferarc/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A lazy functional language
 
 WRKSRC=		${WRKDIR}/src
+
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DUSE_READLINE=1" \
+		LDFLAGS="${LDFLAGS} -lm -lreadline" OPTFLAGS=""
+
+DOCSDIR=	${PREFIX}/share/doc/Gofer
 LIBDIR=		${PREFIX}/lib/Gofer
 MAN1=		gofer.1
 
@@ -33,8 +38,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/src/gofc ${LIBDIR}
 	${INSTALL_MAN} ${WRKDIR}/docs/gofer.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/Gofer
-	${INSTALL_DATA} ${WRKDIR}/docs/* ${PREFIX}/share/doc/Gofer
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/docs/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/Gofer/files/patch-aa b/lang/Gofer/files/patch-aa
deleted file mode 100644
index 26730e202840..000000000000
--- a/lang/Gofer/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	Fri Mar 31 01:02:20 1995
-+++ Makefile	Wed Jan 31 01:39:22 2001
-@@ -23,11 +23,10 @@
- # as you use to build the file runtime.o (as specified by the CC macro
- # below).
- 
--CC		= cc
--#CFLAGS		= -DUSE_READLINE=1
--CFLAGS		=
--LDFLAGS    	= -lm
--OPTFLAGS	= -O
-+CC		?= cc
-+CFLAGS		+= -DUSE_READLINE=1
-+LDFLAGS    	= -lm -lreadline
-+#OPTFLAGS	= -O
- OPT1		=
- #OPT1		= -O1
- 
diff --git a/lang/Gofer/pkg-plist b/lang/Gofer/pkg-plist
index e236390b243e..db5207c5cc3c 100644
--- a/lang/Gofer/pkg-plist
+++ b/lang/Gofer/pkg-plist
@@ -10,39 +10,39 @@ lib/Gofer/gofc.h
 lib/Gofer/runtime.o
 lib/Gofer/gofer
 lib/Gofer/gofc
-%%PORTDOCS%%share/doc/Gofer/Readme
-%%PORTDOCS%%share/doc/Gofer/appx_a
-%%PORTDOCS%%share/doc/Gofer/appx_b
-%%PORTDOCS%%share/doc/Gofer/appx_c
-%%PORTDOCS%%share/doc/Gofer/appx_d
-%%PORTDOCS%%share/doc/Gofer/appx_e
-%%PORTDOCS%%share/doc/Gofer/appx_f
-%%PORTDOCS%%share/doc/Gofer/appx_g
-%%PORTDOCS%%share/doc/Gofer/bowen.1
-%%PORTDOCS%%share/doc/Gofer/ch00
-%%PORTDOCS%%share/doc/Gofer/ch01
-%%PORTDOCS%%share/doc/Gofer/ch02
-%%PORTDOCS%%share/doc/Gofer/ch03
-%%PORTDOCS%%share/doc/Gofer/ch04
-%%PORTDOCS%%share/doc/Gofer/ch05
-%%PORTDOCS%%share/doc/Gofer/ch06
-%%PORTDOCS%%share/doc/Gofer/ch07
-%%PORTDOCS%%share/doc/Gofer/ch08
-%%PORTDOCS%%share/doc/Gofer/ch09
-%%PORTDOCS%%share/doc/Gofer/ch10
-%%PORTDOCS%%share/doc/Gofer/ch11
-%%PORTDOCS%%share/doc/Gofer/ch12
-%%PORTDOCS%%share/doc/Gofer/ch13
-%%PORTDOCS%%share/doc/Gofer/ch14
-%%PORTDOCS%%share/doc/Gofer/gofer.1
-%%PORTDOCS%%share/doc/Gofer/gofer.c
-%%PORTDOCS%%share/doc/Gofer/goferdoc.tex
-%%PORTDOCS%%share/doc/Gofer/hype
-%%PORTDOCS%%share/doc/Gofer/jeroen.1
-%%PORTDOCS%%share/doc/Gofer/rel221.tex
-%%PORTDOCS%%share/doc/Gofer/rel228.tex
-%%PORTDOCS%%share/doc/Gofer/release.221
-%%PORTDOCS%%share/doc/Gofer/release.228
-%%PORTDOCS%%share/doc/Gofer/release.230
-%%PORTDOCS%%@dirrm share/doc/Gofer
+%%PORTDOCS%%%%DOCSDIR%%/Readme
+%%PORTDOCS%%%%DOCSDIR%%/appx_a
+%%PORTDOCS%%%%DOCSDIR%%/appx_b
+%%PORTDOCS%%%%DOCSDIR%%/appx_c
+%%PORTDOCS%%%%DOCSDIR%%/appx_d
+%%PORTDOCS%%%%DOCSDIR%%/appx_e
+%%PORTDOCS%%%%DOCSDIR%%/appx_f
+%%PORTDOCS%%%%DOCSDIR%%/appx_g
+%%PORTDOCS%%%%DOCSDIR%%/bowen.1
+%%PORTDOCS%%%%DOCSDIR%%/ch00
+%%PORTDOCS%%%%DOCSDIR%%/ch01
+%%PORTDOCS%%%%DOCSDIR%%/ch02
+%%PORTDOCS%%%%DOCSDIR%%/ch03
+%%PORTDOCS%%%%DOCSDIR%%/ch04
+%%PORTDOCS%%%%DOCSDIR%%/ch05
+%%PORTDOCS%%%%DOCSDIR%%/ch06
+%%PORTDOCS%%%%DOCSDIR%%/ch07
+%%PORTDOCS%%%%DOCSDIR%%/ch08
+%%PORTDOCS%%%%DOCSDIR%%/ch09
+%%PORTDOCS%%%%DOCSDIR%%/ch10
+%%PORTDOCS%%%%DOCSDIR%%/ch11
+%%PORTDOCS%%%%DOCSDIR%%/ch12
+%%PORTDOCS%%%%DOCSDIR%%/ch13
+%%PORTDOCS%%%%DOCSDIR%%/ch14
+%%PORTDOCS%%%%DOCSDIR%%/gofer.1
+%%PORTDOCS%%%%DOCSDIR%%/gofer.c
+%%PORTDOCS%%%%DOCSDIR%%/goferdoc.tex
+%%PORTDOCS%%%%DOCSDIR%%/hype
+%%PORTDOCS%%%%DOCSDIR%%/jeroen.1
+%%PORTDOCS%%%%DOCSDIR%%/rel221.tex
+%%PORTDOCS%%%%DOCSDIR%%/rel228.tex
+%%PORTDOCS%%%%DOCSDIR%%/release.221
+%%PORTDOCS%%%%DOCSDIR%%/release.228
+%%PORTDOCS%%%%DOCSDIR%%/release.230
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/Gofer