8 files changed, 18 insertions, 22 deletions
diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index 7d64534c1736..be487f31a508 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -29,14 +29,10 @@ LDFLAGS+=	-lm -lreadline -lncurses
 USES+=		tk
 CFLAGS+=	-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} -ltcl${TCL_SHLIB_VER} -lTix8.4.3
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_prelude.h
 .endif
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs
 
-post-patch:
-.if empty(PORT_OPTIONS:MX11)
-	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-src::prelude.h
-.endif
-
 .include <bsd.port.mk>
diff --git a/lang/ohugs/files/extra-patch-src::prelude.h b/lang/ohugs/files/extra-patch-src_prelude.h
index 952a23b7c435..952a23b7c435 100644
--- a/lang/ohugs/files/extra-patch-src::prelude.h
+++ b/lang/ohugs/files/extra-patch-src_prelude.h
diff --git a/lang/ohugs/files/patch-Makefile b/lang/ohugs/files/patch-Makefile
index 837eb46cc88c..880075c01f5a 100644
--- a/lang/ohugs/files/patch-Makefile
+++ b/lang/ohugs/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2014-02-20 12:06:18.000000000 +0100
-+++ Makefile	2014-02-20 12:08:16.000000000 +0100
-@@ -5,14 +5,14 @@
+--- Makefile.orig	2000-09-13 22:17:47 UTC
++++ Makefile
+@@ -5,14 +5,14 @@ all:
  	cd src; make
  
  install: ohugs
diff --git a/lang/ohugs/files/patch-src_omonad.c b/lang/ohugs/files/patch-src_omonad.c
index 36f56c54050a..40f5314bc953 100644
--- a/lang/ohugs/files/patch-src_omonad.c
+++ b/lang/ohugs/files/patch-src_omonad.c
@@ -1,6 +1,6 @@
---- src/omonad.c.orig
+--- src/omonad.c.orig	2001-01-31 00:18:40 UTC
 +++ src/omonad.c
-@@ -526,7 +526,7 @@
+@@ -526,7 +526,7 @@ typedef int socklen_t;
  
  static int maxfd = -1;
  
diff --git a/lang/ohugs/files/patch-src__parser.y b/lang/ohugs/files/patch-src_parser.y
index 2a7d0ff9ced9..284ee7be27f5 100644
--- a/lang/ohugs/files/patch-src__parser.y
+++ b/lang/ohugs/files/patch-src_parser.y
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/parser.y.orig	2000-11-29 23:13:01 UTC
++++ src/parser.y
+@@ -564,7 +564,7 @@ gen       : mexp FROM exp               
  handle    : HANDLE beg malts end        {$$ = gc4(rev($3));}
            ;
  ohandle   : handle                      {$$ = $1;}
diff --git a/lang/ohugs/files/patch-src__prelude.h b/lang/ohugs/files/patch-src_prelude.h
index 0e04d8541e55..fb373a1fdc1e 100644
--- a/lang/ohugs/files/patch-src__prelude.h
+++ b/lang/ohugs/files/patch-src_prelude.h
@@ -1,5 +1,5 @@
---- src/prelude.h.orig	Wed Jan 31 01:18:40 2001
-+++ src/prelude.h	Wed Mar  5 18:53:02 2003
+--- src/prelude.h.orig	2016-06-17 23:19:53 UTC
++++ src/prelude.h
 @@ -22,7 +22,7 @@
   * update the source.
   *-------------------------------------------------------------------------*/
diff --git a/lang/ohugs/files/patch-src_tkhaskell.c b/lang/ohugs/files/patch-src_tkhaskell.c
index 1b7b9e144242..3fa55da7215d 100644
--- a/lang/ohugs/files/patch-src_tkhaskell.c
+++ b/lang/ohugs/files/patch-src_tkhaskell.c
@@ -1,6 +1,6 @@
---- src/tkhaskell.c.orig	2014-02-20 12:00:29.000000000 +0100
-+++ src/tkhaskell.c	2014-02-20 12:02:44.000000000 +0100
-@@ -160,17 +160,17 @@
+--- src/tkhaskell.c.orig	2001-01-28 06:02:45 UTC
++++ src/tkhaskell.c
+@@ -160,17 +160,17 @@ static Int c_primInitTcl () { 
      Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
  
      if (Tcl_Init(interp) == TCL_ERROR) {
@@ -21,7 +21,7 @@
  	return FALSE;
      }
  #endif
-@@ -242,17 +242,17 @@
+@@ -242,17 +242,17 @@ static String executeTcl (cmd) 
  String cmd; {
     char errmsg[200];
     if (Tcl_Eval(interp,cmd) != TCL_OK) {
diff --git a/lang/ohugs/files/patch-src__type.c b/lang/ohugs/files/patch-src_type.c
index eb1323acf007..e9373f97d301 100644
--- a/lang/ohugs/files/patch-src__type.c
+++ b/lang/ohugs/files/patch-src_type.c
@@ -1,6 +1,6 @@
---- src/type.c.orig	Fri Jan 21 12:05:35 2005
-+++ src/type.c	Fri Jan 21 12:05:47 2005
-@@ -1165,7 +1165,7 @@
+--- src/type.c.orig	2000-12-06 09:23:55 UTC
++++ src/type.c
+@@ -1165,7 +1165,7 @@ Type t; {
                          break;
          case QUAL     : snd(snd(t)) = freshSig(snd(snd(t)));
                          break;