Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Dec 2013 23:06:15 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335946 - in head/databases/wmjsql: . files
Message-ID:  <201312082306.rB8N6Fcm093505@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312082306.rB8N6Fcm093505>