From owner-svn-ports-all@FreeBSD.ORG Tue Dec 24 13:41:42 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BC57831; Tue, 24 Dec 2013 13:41:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C83B1213; Tue, 24 Dec 2013 13:41:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBODfgRZ005718; Tue, 24 Dec 2013 13:41:42 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBODfgWX005717; Tue, 24 Dec 2013 13:41:42 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312241341.rBODfgWX005717@svn.freebsd.org> From: Pawel Pekala Date: Tue, 24 Dec 2013 13:41:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337354 - head/mail/wmmaiload X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 13:41:42 -0000 Author: pawel Date: Tue Dec 24 13:41:41 2013 New Revision: 337354 URL: http://svnweb.freebsd.org/changeset/ports/337354 Log: - Fix build on -current - Convert to new options framework - Support staging PR: ports/184899 Submitted by: KATO Tsuguru Modified: head/mail/wmmaiload/Makefile (contents, props changed) Modified: head/mail/wmmaiload/Makefile ============================================================================== --- head/mail/wmmaiload/Makefile Tue Dec 24 13:32:47 2013 (r337353) +++ head/mail/wmmaiload/Makefile Tue Dec 24 13:41:41 2013 (r337354) @@ -10,37 +10,45 @@ MASTER_SITES= http://tnemeth.free.fr/pro MAINTAINER= ports@FreeBSD.org COMMENT= Incoming mail monitor dockapp with a similar look to wmcpuload +OPTIONS_DEFINE= GTK2 + USES= gmake pkgconfig USE_XORG= xpm USE_OPENSSL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -MAKE_ARGS= CC="${CC}" \ - CFLAGS="${CFLAGS} -D_GNU_SOURCE ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIB_SSL="-lssl -lcrypto" \ - LIB_THREADS="${PTHREAD_LIBS}" \ - DEBUG_CFLAGS="-I${OPENSSLINC}" \ +MAKE_ENV= DEBUG_CFLAGS="-I${OPENSSLINC}" \ DEBUG_LDFLAGS="-L${OPENSSLLIB}" -MAN1= ${PORTNAME}.1 ${PORTNAME}-config.1 -PLIST_FILES= bin/wmmaiload bin/wmmaiload-config +CFLAGS+= -D_GNU_SOURCE +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= bin/wmmaiload bin/wmmaiload-config \ + man/man1/wmmaiload.1.gz man/man1/wmmaiload-config.1.gz + +.include -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 -MAKE_ARGS+= GTK_CFLAGS="pkg-config --cflags gtk+-2.0" \ +MAKE_ENV+= GTK_CFLAGS="pkg-config --cflags gtk+-2.0" \ GTK_LIBS="pkg-config --libs gtk+-2.0" .else USE_GNOME+= gtk12 -MAKE_ARGS+= GTK_CFLAGS="pkg-config --cflags gtk+" \ +MAKE_ENV+= GTK_CFLAGS="pkg-config --cflags gtk+" \ GTK_LIBS="pkg-config --libs gtk+" .endif -NO_STAGE= yes +.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" +BROKEN= Does not compile on ia64, powerpc, or sparc64 +.endif + post-patch: + @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ + 's| =| ?=|' .for i in wmmaiload/Init.make - @${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||g' ${WRKSRC}/${i} + @${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||g ; \ + s|-lpthread|-pthread|g' ${WRKSRC}/${i} .endfor .for i in wmmaiload/checkthread.c @${REINPLACE_CMD} -e 's|isnumber(|isnum(|g' ${WRKSRC}/${i} @@ -63,14 +71,10 @@ post-patch: do-install: .for i in wmmaiload wmmaiload-config - ${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${MANPREFIX}/man/man1 + (cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/doc && ${INSTALL_MAN} ${i}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) .endfor -.include - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif - -.include +.include