Date: Thu, 26 Apr 2007 03:00:39 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/112140: Update port: x11-wm/mlvwm Message-ID: <20070426030039.faa47db9.tkato432@yahoo.com> Resent-Message-ID: <200704251810.l3PIAEuq045770@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112140
>Category: ports
>Synopsis: Update port: x11-wm/mlvwm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 25 18:10:14 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix build
Remove file:
files/patch-aa
files/patch-ab
files/patch-ac
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/mlvwm/Makefile x11-wm/mlvwm/Makefile
--- /usr/ports/x11-wm/mlvwm/Makefile Mon Apr 23 04:06:13 2007
+++ x11-wm/mlvwm/Makefile Mon Apr 23 04:35:22 2007
@@ -25,20 +25,28 @@
.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>
diff -urN /usr/ports/x11-wm/mlvwm/files/patch-aa x11-wm/mlvwm/files/patch-aa
--- /usr/ports/x11-wm/mlvwm/files/patch-aa Tue Oct 5 12:16:39 1999
+++ x11-wm/mlvwm/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/x11-wm/mlvwm/files/patch-ab x11-wm/mlvwm/files/patch-ab
--- /usr/ports/x11-wm/mlvwm/files/patch-ab Tue Oct 5 12:16:39 1999
+++ x11-wm/mlvwm/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/x11-wm/mlvwm/files/patch-ac x11-wm/mlvwm/files/patch-ac
--- /usr/ports/x11-wm/mlvwm/files/patch-ac Tue Feb 29 17:23:34 2000
+++ x11-wm/mlvwm/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -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)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070426030039.faa47db9.tkato432>