From owner-svn-ports-all@FreeBSD.ORG Sat Jan 25 16:45:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B161FE43; Sat, 25 Jan 2014 16:45:01 +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 83ECB1FBB; Sat, 25 Jan 2014 16:45:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PGj1MC097301; Sat, 25 Jan 2014 16:45:01 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PGj1eO097300; Sat, 25 Jan 2014 16:45:01 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251645.s0PGj1eO097300@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 16:45:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341051 - in head/databases/wmjsql: . files 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: Sat, 25 Jan 2014 16:45:01 -0000 Author: miwi Date: Sat Jan 25 16:45:01 2014 New Revision: 341051 URL: http://svnweb.freebsd.org/changeset/ports/341051 QAT: https://qat.redports.org/buildarchive/r341051/ Log: - Fix build on -current - Add LICENSE - Support PLIST_FILES - Stage support PR: 184833 Submitted by: ports fury Deleted: head/databases/wmjsql/files/ head/databases/wmjsql/pkg-plist Modified: head/databases/wmjsql/Makefile Modified: head/databases/wmjsql/Makefile ============================================================================== --- head/databases/wmjsql/Makefile Sat Jan 25 16:39:52 2014 (r341050) +++ head/databases/wmjsql/Makefile Sat Jan 25 16:45:01 2014 (r341051) @@ -11,32 +11,41 @@ MASTER_SITES= http://www.dockapps.org/fi MAINTAINER= ports@FreeBSD.org COMMENT= MySQL server status displaying dockapp -USE_MYSQL= yes +LICENSE= GPLv2 # (or later) + +WRKSRC= ${WRKDIR}/${PORTNAME}/src + USES= gmake +USE_MYSQL= yes USE_XORG= xpm - ALL_TARGET= clean all MAKE_JOBS_UNSAFE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}/src +CPPFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib + +PORTDOCS= README +PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's,^INCDIR.*$$,INCDIR = -I${PREFIX}/include/X11 \ - -I${PREFIX}/include -I${LOCALBASE}/include,' \ - -e 's,^LIBDIR.*$$,LIBDIR = -L${PREFIX}/lib \ - -L${LOCALBASE}/lib/mysql,' -e '/^CC/d; /^CFLAGS/d' \ - -e 's,-D$$(shell echo `uname -s`),,' ${WRKSRC}/Makefile \ - ${WRKSRC}/jDockApp/Makefile ${WRKSRC}/xutils/Makefile - @${REINPLACE_CMD} -E 's,\.wmjsql([^r]),\.wmjsqlrc\1,' \ - ${WRKSRC}/wmjsql.jet ${WRKSRC}/../README +.for i in Makefile jDockApp/Makefile xutils/Makefile + @${REINPLACE_CMD} -e \ + '/^INCDIR/s|=.*|= $${CPPFLAGS}| ; \ + /^LIBDIR/s|=.*|= $${LDFLAGS}| ; \ + /^CC/d ; \ + /^CFLAGS/d ; \ + s| make | $$(MAKE) | ; \ + s|-D$$(shell echo `uname -s`)||' ${WRKSRC}/${i} +.endfor +.for i in wmjsql.jet ../README + @${REINPLACE_CMD} -E 's|\.wmjsql([^r])|\.wmjsqlrc\1|' \ + ${WRKSRC}/${i} +.endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/.. && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include