From fa8d0e026665c58d1fe362433eeff17f7a3e3dce Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Tue, 3 Dec 2013 19:12:34 +0000 Subject: - Remove USE_GCC and fix build with clang. - Replace nomalloc script with REINPLACE_CMD. - Remove noextradepend script. It is no longer needed. PR: ports/181820 Approved by: maintainer timeout (3 months) --- deskutils/xmdiary/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'deskutils/xmdiary/Makefile') diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index 934ef03e52fa..76821b1505bb 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmdiary PORTVERSION= 3.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= office @@ -15,7 +15,6 @@ COMMENT= Personal and group calendar utility NO_CDROM= Don't sell for profit EXTRACT_ONLY= ${DISTNAME}.tar.gz USES= imake motif -USE_GCC= any USE_XORG= x11 xext xp xpm xt MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \ @@ -23,10 +22,9 @@ MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ NO_STAGE= yes post-patch: - @${ECHO_MSG} removing the "malloc.h" includes - ${SH} ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero - @${ECHO_MSG} removing unnecessary DependTarget from Imakefile-s - ${SH} ${SCRIPTDIR}/noextradepend $(WRKSRC) 2>&1 > /dev/zero + @${REINPLACE_CMD} -e 's/malloc\.h/stdlib.h/' \ + ${WRKSRC}/tools/LstLinked.c ${WRKSRC}/tools/System.c \ + ${WRKSRC}/xtools/xitClipboard.c ${WRKSRC}/xtools/xitInfoFile.c ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|CcCmd gcc|CcCmd ${CC}|' '${WRKSRC}/XDiary.tmpl' -- cgit v1.2.3