diff options
| author | Yukihiro Nakai <nakai@FreeBSD.org> | 2000-02-29 08:23:37 +0000 |
|---|---|---|
| committer | Yukihiro Nakai <nakai@FreeBSD.org> | 2000-02-29 08:23:37 +0000 |
| commit | f15b3e969422464f73143d42c053897df14da6e0 (patch) | |
| tree | 316b37cd40654168485197e68c84962ab16eebf3 /x11-wm | |
| parent | Oops, forgot to save the editor buffer on the other vty (diff) | |
Support CFLAGS/PREFIX properly
PR: ports/17052
Notes
Notes:
svn path=/head/; revision=26433
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/mlvwm/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/mlvwm/files/patch-ac | 18 | ||||
| -rw-r--r-- | x11-wm/mlvwm/pkg-plist | 6 |
3 files changed, 20 insertions, 8 deletions
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile index 799d294b8a2c..5bc9ba470ced 100644 --- a/x11-wm/mlvwm/Makefile +++ b/x11-wm/mlvwm/Makefile @@ -22,6 +22,9 @@ MAN1= mlvwm.1 MLVWMLIBDIR= ${PREFIX}/lib/X11/mlvwm +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* @@ -30,6 +33,5 @@ post-install: @${MKDIR} ${MLVWMLIBDIR}/pixmap ${INSTALL_DATA} ${WRKSRC}/pixmap/*.xpm ${MLVWMLIBDIR}/pixmap ${INSTALL_DATA} ${WRKSRC}/sample_rc/Mlvwmrc* ${MLVWMLIBDIR} - (cd ${MLVWMLIBDIR}/pixmap; ${TAR} xzf ${DISTDIR}/mini-icons.tar.gz) .include <bsd.port.mk> diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac index fd4f1f49cc68..77247a0ef0e3 100644 --- a/x11-wm/mlvwm/files/patch-ac +++ b/x11-wm/mlvwm/files/patch-ac @@ -1,7 +1,12 @@ *** configure.h.orig Tue Jul 13 00:35:34 1999 ---- configure.h Thu Sep 23 00:19:06 1999 +--- configure.h Mon Feb 28 05:05:14 2000 *************** -*** 74,80 **** +*** 69,80 **** + #endif + + XCOMM +! CDEBUGFLAGS = -g -Wall -Wshadow + XCOMM CDEBUGFLAGS = -O2 -Wall XCOMM CDEBUGFLAGS = -g -Wall XCOMM CDEBUGFLAGS = -g @@ -9,11 +14,16 @@ MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE) MLVWMLIBRARIES = $(Locale_LIBRARIES) ---- 74,80 ---- +--- 69,80 ---- + #endif + + XCOMM +! XCOMM CDEBUGFLAGS = -g -Wall -Wshadow + XCOMM CDEBUGFLAGS = -O2 -Wall XCOMM CDEBUGFLAGS = -g -Wall XCOMM CDEBUGFLAGS = -g -! ICONPATH = /usr/X11R6/include/X11/pixmaps +! ICONPATH = $(INCROOT)/X11/pixmaps MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE) MLVWMLIBRARIES = $(Locale_LIBRARIES) diff --git a/x11-wm/mlvwm/pkg-plist b/x11-wm/mlvwm/pkg-plist index 15a84214b9c6..6ee2f343b38c 100644 --- a/x11-wm/mlvwm/pkg-plist +++ b/x11-wm/mlvwm/pkg-plist @@ -44,7 +44,6 @@ lib/X11/mlvwm/pixmap/mini-lock.xpm lib/X11/mlvwm/pixmap/mini-lower.xpm lib/X11/mlvwm/pixmap/mini-mail.xpm lib/X11/mlvwm/pixmap/mini-manual.xpm -lib/X11/mlvwm/pixmap/mini-sh.xpm lib/X11/mlvwm/pixmap/mini-max1.xpm lib/X11/mlvwm/pixmap/mini-maze.xpm lib/X11/mlvwm/pixmap/mini-modules.xpm @@ -64,8 +63,8 @@ lib/X11/mlvwm/pixmap/mini-rball.xpm lib/X11/mlvwm/pixmap/mini-resize.xpm lib/X11/mlvwm/pixmap/mini-roach.xpm lib/X11/mlvwm/pixmap/mini-run.xpm +lib/X11/mlvwm/pixmap/mini-sh.xpm lib/X11/mlvwm/pixmap/mini-sh1.xpm -lib/X11/mlvwm/pixmap/mini-x.xpm lib/X11/mlvwm/pixmap/mini-slon.xpm lib/X11/mlvwm/pixmap/mini-start.xpm lib/X11/mlvwm/pixmap/mini-stop.xpm @@ -73,6 +72,7 @@ lib/X11/mlvwm/pixmap/mini-term.xpm lib/X11/mlvwm/pixmap/mini-tetris.xpm lib/X11/mlvwm/pixmap/mini-turn.xpm lib/X11/mlvwm/pixmap/mini-windows.xpm +lib/X11/mlvwm/pixmap/mini-x.xpm lib/X11/mlvwm/pixmap/mini-x2.xpm lib/X11/mlvwm/pixmap/mini-xmahjongg.xpm lib/X11/mlvwm/pixmap/mini-xv.xpm @@ -86,7 +86,6 @@ lib/X11/mlvwm/pixmap/mini.destroy.xpm lib/X11/mlvwm/pixmap/mini.excl.xpm lib/X11/mlvwm/pixmap/mini.exit.xpm lib/X11/mlvwm/pixmap/mini.eye.xpm -lib/X11/mlvwm/pixmap/mini.xpm lib/X11/mlvwm/pixmap/mini.fvwm.xpm lib/X11/mlvwm/pixmap/mini.iconify.xpm lib/X11/mlvwm/pixmap/mini.letter.xpm @@ -110,6 +109,7 @@ lib/X11/mlvwm/pixmap/mini.xlock.xpm lib/X11/mlvwm/pixmap/mini.xmag.xpm lib/X11/mlvwm/pixmap/mini.xman.xpm lib/X11/mlvwm/pixmap/mini.xpaint.xpm +lib/X11/mlvwm/pixmap/mini.xpm lib/X11/mlvwm/pixmap/mini.xterm.xpm lib/X11/mlvwm/pixmap/mini.zircon.xpm @dirrm lib/X11/mlvwm/pixmap |