Date: Mon, 14 Aug 2006 11:04:49 +0330 From: "Babak Farrokhi" <babak@farrokhi.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/101997: [Maintainer Update] x11-wm/jwm - UnBROKEN on 4.x Message-ID: <1155540889.56926@starfish.datak.net> Resent-Message-ID: <200608140740.k7E7eFAr043595@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101997
>Category: ports
>Synopsis: [Maintainer Update] x11-wm/jwm - UnBROKEN on 4.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 14 07:40:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Babak Farrokhi
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD 6.1-STABLE #0: Mon Jul 24 11:42:49 IRST 2006
root@starfish.datak.net:/usr/obj/usr/src/sys/STARFISH
>Description:
- Add new MASTERSITES
- Respect DESTDIR
- Fix build on 4.x (now builds fine on 4,5,6 and 7, tested on tinderbox)
>How-To-Repeat:
>Fix:
--- jwm.patch begins here ---
diff -ruN jwm.orig/Makefile jwm/Makefile
--- jwm.orig/Makefile Mon Aug 14 10:20:08 2006
+++ jwm/Makefile Mon Aug 14 10:31:12 2006
@@ -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_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 @@
.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/
--- jwm.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1155540889.56926>