* Make port respect PREFIX, CFLAGS, LDFLAGS.

* Cleanup patches, use REINPLACE were appropriate.

Approved by:	maintainer

7 files changed, 78 insertions, 120 deletions

diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index d389ca120897..e64914984732 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -18,13 +18,19 @@ LIB_DEPENDS=	tix4182:${PORTSDIR}/x11-toolkits/tix
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
+USE_REINPLACE=	yes
 USE_BISON=	yes
 
 post-patch:
+.if defined(WITHOUT_X11)
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-src::prelude.h
+.endif
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile
 .if !defined(WITHOUT_X11)
-	cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/extra-patch-graphics
-.else
-	cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/extra-patch-text
+	@${REINPLACE_CMD} -e 's|#CFLAGS+=|CFLAGS+= -I${PREFIX}/include/tk8.2 \
+	 -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include -I${X11BASE}/include| ; \
+	 s|#LDFLAGS+=|LDFLAGS+=-L${PREFIX}/lib -ltk82 -ltcl82 -ltix4182|' \
+		${WRKSRC}/src/Makefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/ohugs/files/extra-patch-graphics b/lang/ohugs/files/extra-patch-graphics
deleted file mode 100644
index c3ac5fbbb2b2..000000000000
--- a/lang/ohugs/files/extra-patch-graphics
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ruN ohugs-0.5/src/Makefile ohugs-0.5-graphics/src/Makefile
---- ohugs-0.5/src/Makefile	Fri Jan 26 19:37:15 2001
-+++ ohugs-0.5-graphics/src/Makefile	Wed Mar  5 13:39:23 2003
-@@ -41,12 +41,12 @@
- # and set O_TK to 0 in prelude.h.
- 
- # Solaris
--CFLAGS		= -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include
--LDFLAGS    	= -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0
-+#CFLAGS		= -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include
-+#LDFLAGS    	= -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0
- 
- # NetBSD
--#CFLAGS		= -g -I/usr/X11/include -I/usr/pkg/include/tk8.0  -I/usr/pkg/include -I/usr/pkg/include/tcl8.0
--#LDFLAGS    	= -lm -lreadline -ltermcap -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/X11/lib -Wl,-R/usr/X11/lib -lX11 -ltk80 -ltcl80 -ltix4180
-+CFLAGS		= -g -I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2 -I/usr/local/include -I/usr/X11R6/include 
-+LDFLAGS    	= -lm -lreadline -ltermcap -L/usr/local/lib -ltk82 -ltcl82 -L/usr/local/lib -ltix4182 
- 
- # Linux
- #CFLAGS		= -g -I/usr/X11R6/include
-diff -ruN ohugs-0.5/src/parser.y ohugs-0.5-graphics/src/parser.y
---- ohugs-0.5/src/parser.y	Wed Nov 29 23:13:01 2000
-+++ ohugs-0.5-graphics/src/parser.y	Wed Mar  5 13:38:25 2003
-@@ -564,7 +564,7 @@
- handle    : HANDLE beg malts end        {$$ = gc4(rev($3));}
-           ;
- ohandle   : handle                      {$$ = $1;}
--          | /*empty*/                   {$$ = gc0(NIL);}
-+          | /*empty*/                   {$$ = gc0(NIL);};
- mexp      : mopExp COCO sigType         {$$ = gc3(ap(ESIGN,pair($1,$3)));}
- 	  | mopExp                      {$$ = $1;}
- 	  ;
-diff -ruN ohugs-0.5/src/prelude.h ohugs-0.5-graphics/src/prelude.h
---- ohugs-0.5/src/prelude.h	Wed Jan 31 00:18:40 2001
-+++ ohugs-0.5-graphics/src/prelude.h	Wed Mar  5 13:37:59 2003
-@@ -22,7 +22,7 @@
-  * update the source.
-  *-------------------------------------------------------------------------*/
- 
--#define SOLARIS  1	/* For Solaris 2.4				   */
-+#define SOLARIS  0	/* For Solaris 2.4				   */
- #define SUNOS    0      /* For Sun 3/Sun 4 running SunOs 4.x		   */
- #define BCWIN16	 0	/* For Windows 3.1, Borland C++ 4.52		   */
- #define BCWIN32  0	/* For Windows 32,  Borland C++ 4.52		   */
-@@ -44,7 +44,7 @@
- #define AIX	 0	/* For IBM AIX on RS/6000 using GCC		UN */
- #define ATARI	 0	/* For Atari ST/STE/TT/Falcon w/ Lattice C 5.52 UN */
- #define SGI4	 0	/* For SiliconGraphics Indigo, IRIX v*4*.0.5	UN */
--#define NETBSD	 0	/* For NetBSD-current				UN */
-+#define NETBSD	 1	/* For NetBSD-current				UN */
- #define MACWP	 0	/* For Macintosh PPC/68K using CodeWarrior Pro     */
- 
- /*---------------------------------------------------------------------------
diff --git a/lang/ohugs/files/extra-patch-src::prelude.h b/lang/ohugs/files/extra-patch-src::prelude.h
new file mode 100644
index 000000000000..952a23b7c435
--- /dev/null
+++ b/lang/ohugs/files/extra-patch-src::prelude.h
@@ -0,0 +1,13 @@
+--- src/prelude.h.bak	Wed Mar  5 19:21:27 2003
++++ src/prelude.h	Wed Mar  5 19:21:50 2003
+@@ -103,8 +103,8 @@
+ #define HAS_FLOATS	(REGULAR_HUGS | LARGE_HUGS | BREAK_FLOATS)
+ 
+ #define OBJ		1 /* Object-oriented extensions                    */
+-#define O_TK            1 /* Tcl/Tk extension (needs OBJ)                  */
+-#define O_TIX           1 /* Tix extension (needs O_TK)                    */
++#define O_TK            0 /* Tcl/Tk extension (needs OBJ)                  */
++#define O_TIX           0 /* Tix extension (needs O_TK)                    */
+ #define O_IP		1 /* TCP/UDP/IP support (needs OBJ)		   */
+ #define HASKELL_ARRAYS	1
+ #define FLAT_ARRAYS	0 /* Warning: Setting 1 is not currently supported */
diff --git a/lang/ohugs/files/extra-patch-text b/lang/ohugs/files/extra-patch-text
deleted file mode 100644
index 1d4d6619f63b..000000000000
--- a/lang/ohugs/files/extra-patch-text
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN ohugs-0.5/src/Makefile ohugs-0.5-text/src/Makefile
---- ohugs-0.5/src/Makefile	Fri Jan 26 19:37:15 2001
-+++ ohugs-0.5-text/src/Makefile	Wed Mar  5 13:42:16 2003
-@@ -41,12 +41,12 @@
- # and set O_TK to 0 in prelude.h.
- 
- # Solaris
--CFLAGS		= -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include
--LDFLAGS    	= -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0
-+#CFLAGS		= -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include
-+#LDFLAGS    	= -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0
- 
- # NetBSD
--#CFLAGS		= -g -I/usr/X11/include -I/usr/pkg/include/tk8.0  -I/usr/pkg/include -I/usr/pkg/include/tcl8.0
--#LDFLAGS    	= -lm -lreadline -ltermcap -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/X11/lib -Wl,-R/usr/X11/lib -lX11 -ltk80 -ltcl80 -ltix4180
-+CFLAGS		= -g
-+LDFLAGS    	= -lm -lreadline -ltermcap
- 
- # Linux
- #CFLAGS		= -g -I/usr/X11R6/include
-diff -ruN ohugs-0.5/src/parser.y ohugs-0.5-text/src/parser.y
---- ohugs-0.5/src/parser.y	Wed Nov 29 23:13:01 2000
-+++ ohugs-0.5-text/src/parser.y	Wed Mar  5 13:42:25 2003
-@@ -564,7 +564,7 @@
- handle    : HANDLE beg malts end        {$$ = gc4(rev($3));}
-           ;
- ohandle   : handle                      {$$ = $1;}
--          | /*empty*/                   {$$ = gc0(NIL);}
-+          | /*empty*/                   {$$ = gc0(NIL);};
- mexp      : mopExp COCO sigType         {$$ = gc3(ap(ESIGN,pair($1,$3)));}
- 	  | mopExp                      {$$ = $1;}
- 	  ;
-diff -ruN ohugs-0.5/src/prelude.h ohugs-0.5-text/src/prelude.h
---- ohugs-0.5/src/prelude.h	Wed Jan 31 00:18:40 2001
-+++ ohugs-0.5-text/src/prelude.h	Wed Mar  5 13:40:56 2003
-@@ -22,7 +22,7 @@
-  * update the source.
-  *-------------------------------------------------------------------------*/
- 
--#define SOLARIS  1	/* For Solaris 2.4				   */
-+#define SOLARIS  0	/* For Solaris 2.4				   */
- #define SUNOS    0      /* For Sun 3/Sun 4 running SunOs 4.x		   */
- #define BCWIN16	 0	/* For Windows 3.1, Borland C++ 4.52		   */
- #define BCWIN32  0	/* For Windows 32,  Borland C++ 4.52		   */
-@@ -44,7 +44,7 @@
- #define AIX	 0	/* For IBM AIX on RS/6000 using GCC		UN */
- #define ATARI	 0	/* For Atari ST/STE/TT/Falcon w/ Lattice C 5.52 UN */
- #define SGI4	 0	/* For SiliconGraphics Indigo, IRIX v*4*.0.5	UN */
--#define NETBSD	 0	/* For NetBSD-current				UN */
-+#define NETBSD	 1	/* For NetBSD-current				UN */
- #define MACWP	 0	/* For Macintosh PPC/68K using CodeWarrior Pro     */
- 
- /*---------------------------------------------------------------------------
-@@ -103,8 +103,8 @@
- #define HAS_FLOATS	(REGULAR_HUGS | LARGE_HUGS | BREAK_FLOATS)
- 
- #define OBJ		1 /* Object-oriented extensions                    */
--#define O_TK            1 /* Tcl/Tk extension (needs OBJ)                  */
--#define O_TIX           1 /* Tix extension (needs O_TK)                    */
-+#define O_TK            0 /* Tcl/Tk extension (needs OBJ)                  */
-+#define O_TIX           0 /* Tix extension (needs O_TK)                    */
- #define O_IP		1 /* TCP/UDP/IP support (needs OBJ)		   */
- #define HASKELL_ARRAYS	1
- #define FLAT_ARRAYS	0 /* Warning: Setting 1 is not currently supported */
diff --git a/lang/ohugs/files/patch-src::Makefile b/lang/ohugs/files/patch-src::Makefile
new file mode 100644
index 000000000000..384b290cc375
--- /dev/null
+++ b/lang/ohugs/files/patch-src::Makefile
@@ -0,0 +1,25 @@
+--- src/Makefile.orig	Wed Mar  5 20:00:00 2003
++++ src/Makefile	Wed Mar  5 20:00:43 2003
+@@ -34,15 +34,19 @@
+ # ensure that the whole collection of files is recompiled with the correct
+ # settings.
+ 
+-CC		= gcc
++#CC		= gcc
+ 
+ # Choose your operating system
+ # If you don't have Tk, delete the stuff mentioning tcl, tk and X11,
+ # and set O_TK to 0 in prelude.h.
+ 
+ # Solaris
+-CFLAGS		= -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include
+-LDFLAGS    	= -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0
++#CFLAGS		= -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include
++#LDFLAGS    	= -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0
++
++LDFLAGS+=	-lm -lreadline -ltermcap
++#CFLAGS+=
++#LDFLAGS+=
+ 
+ # NetBSD
+ #CFLAGS		= -g -I/usr/X11/include -I/usr/pkg/include/tk8.0  -I/usr/pkg/include -I/usr/pkg/include/tcl8.0
diff --git a/lang/ohugs/files/patch-src::parser.y b/lang/ohugs/files/patch-src::parser.y
new file mode 100644
index 000000000000..2a7d0ff9ced9
--- /dev/null
+++ b/lang/ohugs/files/patch-src::parser.y
@@ -0,0 +1,11 @@
+--- src/parser.y.orig	Thu Nov 30 00:13:01 2000
++++ src/parser.y	Wed Mar  5 18:53:02 2003
+@@ -564,7 +564,7 @@
+ handle    : HANDLE beg malts end        {$$ = gc4(rev($3));}
+           ;
+ ohandle   : handle                      {$$ = $1;}
+-          | /*empty*/                   {$$ = gc0(NIL);}
++          | /*empty*/                   {$$ = gc0(NIL);};
+ mexp      : mopExp COCO sigType         {$$ = gc3(ap(ESIGN,pair($1,$3)));}
+ 	  | mopExp                      {$$ = $1;}
+ 	  ;
diff --git a/lang/ohugs/files/patch-src::prelude.h b/lang/ohugs/files/patch-src::prelude.h
new file mode 100644
index 000000000000..0e04d8541e55
--- /dev/null
+++ b/lang/ohugs/files/patch-src::prelude.h
@@ -0,0 +1,20 @@
+--- src/prelude.h.orig	Wed Jan 31 01:18:40 2001
++++ src/prelude.h	Wed Mar  5 18:53:02 2003
+@@ -22,7 +22,7 @@
+  * update the source.
+  *-------------------------------------------------------------------------*/
+ 
+-#define SOLARIS  1	/* For Solaris 2.4				   */
++#define SOLARIS  0	/* For Solaris 2.4				   */
+ #define SUNOS    0      /* For Sun 3/Sun 4 running SunOs 4.x		   */
+ #define BCWIN16	 0	/* For Windows 3.1, Borland C++ 4.52		   */
+ #define BCWIN32  0	/* For Windows 32,  Borland C++ 4.52		   */
+@@ -44,7 +44,7 @@
+ #define AIX	 0	/* For IBM AIX on RS/6000 using GCC		UN */
+ #define ATARI	 0	/* For Atari ST/STE/TT/Falcon w/ Lattice C 5.52 UN */
+ #define SGI4	 0	/* For SiliconGraphics Indigo, IRIX v*4*.0.5	UN */
+-#define NETBSD	 0	/* For NetBSD-current				UN */
++#define NETBSD	 1	/* For NetBSD-current				UN */
+ #define MACWP	 0	/* For Macintosh PPC/68K using CodeWarrior Pro     */
+ 
+ /*---------------------------------------------------------------------------