- Fix build on -current

- Add LICENSE
- Support PLIST_FILES
- Stage support

PR:		184833
Submitted by:	ports fury

3 files changed, 27 insertions, 48 deletions

diff --git a/databases/wmjsql/Makefile b/databases/wmjsql/Makefile
index 8c2cef594d6d..9963e5ee1d4b 100644
--- a/databases/wmjsql/Makefile
+++ b/databases/wmjsql/Makefile
@@ -11,32 +11,41 @@ MASTER_SITES=	http://www.dockapps.org/files/42/73/ \
 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 <bsd.port.mk>
diff --git a/databases/wmjsql/files/patch-Makefile b/databases/wmjsql/files/patch-Makefile
deleted file mode 100644
index 932322ab93a7..000000000000
--- a/databases/wmjsql/files/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
diff --git a/databases/wmjsql/pkg-plist b/databases/wmjsql/pkg-plist
deleted file mode 100644
index f583361bf924..000000000000
--- a/databases/wmjsql/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/wmjsql
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%