diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-05-18 17:47:26 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-05-18 17:47:26 +0000 |
| commit | 1b2fcc824133433689ecd0c459f983fac03170a4 (patch) | |
| tree | 0023056a7f08f65dd7a2eea6abdd817475495c0e /x11-wm | |
| parent | - Update to 0.1.5 (diff) | |
Use MAKE_ARGS & PLIST-foo
Notes
Notes:
svn path=/head/; revision=135566
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/novawm/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/novawm/files/patch-Makefile.in | 24 |
2 files changed, 9 insertions, 25 deletions
diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile index 824b286efd6d..4da322ad5589 100644 --- a/x11-wm/novawm/Makefile +++ b/x11-wm/novawm/Makefile @@ -21,12 +21,20 @@ USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes GNU_CONFIGURE= yes +MAKE_ARGS= INCLUDES=-I${X11BASE}/include \ + CXXFLAGS="${CXXFLAGS} -D_WIN_GNOME_SUPPORT" \ + novawm_LDFLAGS=-L${X11BASE}/lib + +PLIST_FILES= bin/novawm +.if !defined(NOPORTDOCS) +PORTDOCS= AUTHORS ChangeLog INSTALL README TODO +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in AUTHORS ChangeLog INSTALL README TODO +.for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/x11-wm/novawm/files/patch-Makefile.in b/x11-wm/novawm/files/patch-Makefile.in deleted file mode 100644 index a0cb47632bfe..000000000000 --- a/x11-wm/novawm/files/patch-Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ ---- src/Makefile.in.orig Sun Nov 24 13:12:57 2002 -+++ src/Makefile.in Sat Feb 8 02:02:46 2003 -@@ -73,10 +73,10 @@ - PACKAGE_PIXMAPS_DIR = @PACKAGE_PIXMAPS_DIR@ - VERSION = @VERSION@ - --INCLUDES = -I/usr/X11R6/include -+INCLUDES = -I${X11BASE}/include - - --CXXFLAGS = -D_WIN_GNOME_SUPPORT -DDEBUG -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wtraditional -Wpointer-arith -Wmissing-prototypes -g -+CXXFLAGS = @CXXFLAGS@ -D_WIN_GNOME_SUPPORT - - - bin_PROGRAMS = novawm -@@ -84,7 +84,7 @@ - novawm_SOURCES = main.cpp events.cpp menu.cpp novawm.h winmgr.cpp bar.cpp icon_close.xpm icon_hide.xpm icon_stretch.xpm cfg_parse.cpp - - --novawm_LDFLAGS = -L/usr/X11R6/lib -+novawm_LDFLAGS = -L${X11BASE}/lib - - - novawm_LDADD = -lX11 -lXpm -lstdc++ |