diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2006-08-14 16:57:38 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2006-08-14 16:57:38 +0000 |
| commit | ac3b1f6ab7350c60d14f88a4344bb1fcb87fc4fa (patch) | |
| tree | 1f5377246cf0876191d0247d112e6e23f40d4da5 /x11-wm/jwm | |
| parent | 4ea05a2cba425d62f4c021c23289ff5185498a4d (diff) | |
- Unbreak on 4.x (use GCC 3.4+)
- Respect DESTDIR
- Add new MASTERSITES
PR: ports/101997
Submitted by: Babak Farrokhi <babak at farrokhi.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=170615
Diffstat (limited to 'x11-wm/jwm')
| -rw-r--r-- | x11-wm/jwm/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile index 86c2a5defd12..08afbd357418 100644 --- a/x11-wm/jwm/Makefile +++ b/x11-wm/jwm/Makefile @@ -8,8 +8,9 @@ PORTNAME= jwm PORTVERSION= 1.7 CATEGORIES= x11-wm -MASTER_SITES= http://joewing.net/programs/jwm/ \ - http://www.unixified.net/distfiles/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://joewing.net/programs/ +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= babak@farrokhi.net COMMENT= Joe's Window Manager @@ -20,6 +21,7 @@ USE_X_PREFIX= yes USE_XPM= yes GNU_CONFIGURE= yes USE_BZIP2= yes +USE_GCC= 3.4+ CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -28,19 +30,15 @@ MAN1= jwm.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= Does not compile -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${TARGETDIR}|' ${WRKSRC}/example.jwmrc do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample - if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \ - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${TARGETDIR}/bin + ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${TARGETDIR}/etc/system.jwmrc.sample + if ! [ -f ${TARGETDIR}/etc/system.jwmrc ]; then \ + ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${TARGETDIR}/etc/system.jwmrc; \ fi ${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1/ |