- Fix build

PR:		112140
Submitted by:	KATO Tsuguru <tkato432 AT yahoo.com>
Approved by:	clsung (mentor)
Noted by:	kris

4 files changed, 16 insertions, 94 deletions

diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 273986748816..bce560d06e07 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -23,22 +23,28 @@ MAN1=		mlvwm.1
 
 MLVWMLIBDIR=	${PREFIX}/lib/X11/mlvwm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 600100
-BROKEN=		Does not build
-.endif
-
 post-extract:
 	@${TAR} -C ${WRKSRC}/pixmap -xzf ${DISTDIR}/mini-icons.tar.gz
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample_rc/Mlvwmrc*
+.for file in configure.h
+	@${REINPLACE_CMD} -e \
+		's|^.*CDEBUGFLAGS =.*$$||g ; \
+		 s|^ICONPATH =.*$$|ICONPATH = $$(INCROOT)/X11/pixmaps|g ; \
+		 s|-lxpg4||g' ${WRKSRC}/${file}
+.endfor
+.for file in Mlvwmrc Mlvwmrc-j
+	@${REINPLACE_CMD} -e \
+		's|^IconPath .*$$|IconPath ${MLVWMLIBDIR}/pixmap|g ; \
+		 s|kterm|xterm|g' ${WRKSRC}/sample_rc/${file}
+.endfor
 
 post-install:
-	@${RM} -f ${WRKSRC}/sample_rc/*.orig
+	@${MKDIR} ${MLVWMLIBDIR}
+.for file in Mlvwmrc Mlvwmrc-Kterm-j Mlvwmrc-Netscape Mlvwmrc-Xterm Mlvwmrc-j
+	${INSTALL_DATA} ${WRKSRC}/sample_rc/${file} ${MLVWMLIBDIR}
+.endfor
 	@${MKDIR} ${MLVWMLIBDIR}/pixmap
 	${INSTALL_DATA} ${WRKSRC}/pixmap/*.xpm ${MLVWMLIBDIR}/pixmap
-	${INSTALL_DATA} ${WRKSRC}/sample_rc/Mlvwmrc* ${MLVWMLIBDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/mlvwm/files/patch-aa b/x11-wm/mlvwm/files/patch-aa
deleted file mode 100644
index 7ae859e5c5c2..000000000000
--- a/x11-wm/mlvwm/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** sample_rc/Mlvwmrc.orig	Sat Jan 23 21:37:52 1999
---- sample_rc/Mlvwmrc	Thu Sep 23 00:15:13 1999
-***************
-*** 52,58 ****
-  Compatible
-  
-  # Set icon search path. It needs before "Style".
-! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
-  IconMenuIcon label2.xpm
-  
-  # Balloon help Settings
---- 52,58 ----
-  Compatible
-  
-  # Set icon search path. It needs before "Style".
-! IconPath %%PREFIX%%/lib/X11/pixmaps
-  IconMenuIcon label2.xpm
-  
-  # Balloon help Settings
-***************
-*** 80,86 ****
-  Menu Apple, Icon label1.xpm, Stick
-  "About this Workstation..." NonSelect, Gray, Action About
-  "" NonSelect
-! "Terminal"	Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
-  "Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
-  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
-  END
---- 80,86 ----
-  Menu Apple, Icon label1.xpm, Stick
-  "About this Workstation..." NonSelect, Gray, Action About
-  "" NonSelect
-! "Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm -ls
-  "Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
-  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
-  END
diff --git a/x11-wm/mlvwm/files/patch-ab b/x11-wm/mlvwm/files/patch-ab
deleted file mode 100644
index 583f9c263784..000000000000
--- a/x11-wm/mlvwm/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** sample_rc/Mlvwmrc-j.orig	Wed Mar 24 00:03:23 1999
---- sample_rc/Mlvwmrc-j	Thu Sep 23 00:16:35 1999
-***************
-*** 52,58 ****
-  Compatible
-  
-  # IconPath の指定。Style の指定の前に必要
-! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
-  IconMenuIcon label2.xpm
-  
-  # Balloon help Settings
---- 52,58 ----
-  Compatible
-  
-  # IconPath の指定。Style の指定の前に必要
-! IconPath %%PREFIX%%/lib/X11/mlvwm/pixmaps
-  IconMenuIcon label2.xpm
-  
-  # Balloon help Settings
diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac
deleted file mode 100644
index 77247a0ef0e3..000000000000
--- a/x11-wm/mlvwm/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
-*** configure.h.orig	Tue Jul 13 00:35:34 1999
---- configure.h	Mon Feb 28 05:05:14 2000
-***************
-*** 69,80 ****
-  #endif
-  
-  XCOMM 
-!       CDEBUGFLAGS = -g -Wall -Wshadow
-  XCOMM            CDEBUGFLAGS = -O2 -Wall
-  XCOMM            CDEBUGFLAGS = -g -Wall
-  XCOMM            CDEBUGFLAGS = -g
-  
-! ICONPATH = /usr/X11R6/include/pixmaps
-  
-  MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE)
-  MLVWMLIBRARIES = $(Locale_LIBRARIES)
---- 69,80 ----
-  #endif
-  
-  XCOMM 
-! XCOMM      CDEBUGFLAGS = -g -Wall -Wshadow
-  XCOMM            CDEBUGFLAGS = -O2 -Wall
-  XCOMM            CDEBUGFLAGS = -g -Wall
-  XCOMM            CDEBUGFLAGS = -g
-  
-! ICONPATH = $(INCROOT)/X11/pixmaps
-  
-  MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE)
-  MLVWMLIBRARIES = $(Locale_LIBRARIES)