From owner-svn-ports-all@FreeBSD.ORG  Sun Dec  8 23:06:16 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 25D32683;
 Sun,  8 Dec 2013 23:06:16 +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 1180B16E6;
 Sun,  8 Dec 2013 23:06:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8N6Flv093509;
 Sun, 8 Dec 2013 23:06:15 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8N6Fcm093505;
 Sun, 8 Dec 2013 23:06:15 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201312082306.rB8N6Fcm093505@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Sun, 8 Dec 2013 23:06:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335946 - 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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Dec 2013 23:06:16 -0000

Author: marino
Date: Sun Dec  8 23:06:15 2013
New Revision: 335946
URL: http://svnweb.freebsd.org/changeset/ports/335946

Log:
  databases/wmjsql: Unbreak on F10, head
  
  Port requires the specified gmake, but "make" was hardcoded and bmake
  was used instead.

Added:
  head/databases/wmjsql/files/
  head/databases/wmjsql/files/patch-Makefile   (contents, props changed)
Modified:
  head/databases/wmjsql/Makefile

Modified: head/databases/wmjsql/Makefile
==============================================================================
--- head/databases/wmjsql/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
+++ head/databases/wmjsql/Makefile	Sun Dec  8 23:06:15 2013	(r335946)
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL server status displaying dockapp
 
 USE_MYSQL=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_XORG=	xpm
 
 ALL_TARGET=	clean all

Added: head/databases/wmjsql/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/wmjsql/files/patch-Makefile	Sun Dec  8 23:06:15 2013	(r335946)
@@ -0,0 +1,27 @@
+--- Makefile.orig	2001-08-16 13:04:23.000000000 +0000
++++ Makefile
+@@ -25,20 +25,20 @@ all:	${name}
+ #	${name}
+ 
+ jDockApp.o: jDockApp/jDockApp_main.xpm jDockApp/jDockApp.c
+-	cd $*; make $*.o
++	cd $*; $(MAKE) $*.o
+ 
+ xutils.o: xutils/xutils.c
+-	cd $*; make $*.o
++	cd $*; $(MAKE) $*.o
+ 
+ jprintf.o: jDockApp/jprintf.c
+-	cd jDockApp; make jprintf.o
++	cd jDockApp; $(MAKE) jprintf.o
+ 
+ ${name}: $(OBJS) ${name}.c
+ 	$(CC) $(CFLAGS) $(SYSTEM) -o ${name} $^ $(INCDIR) $(LIBDIR) $(LIBS)
+ 
+ install: all
+ 	sudo install ${owner} ${group} -s -m 755 ./${name}  ${prefix}/${name}
+-	make clean;
++	$(MAKE) clean;
+ 
+ clean:
+ 	rm -f *.o ${name} ${name}.c *.orig *.rej *.3