Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Dec 2015 15:28:47 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404055 - head/databases/wmjsql
Message-ID:  <201512201528.tBKFSls2073564@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Dec 20 15:28:47 2015
New Revision: 404055
URL: https://svnweb.freebsd.org/changeset/ports/404055

Log:
  - Add LICENSE_FILE
  - Improve WRKSRC handling
  - Simplify installation
  - Switch to options helpers

Modified:
  head/databases/wmjsql/Makefile

Modified: head/databases/wmjsql/Makefile
==============================================================================
--- head/databases/wmjsql/Makefile	Sun Dec 20 14:35:13 2015	(r404054)
+++ head/databases/wmjsql/Makefile	Sun Dec 20 15:28:47 2015	(r404055)
@@ -11,8 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL server status displaying dockapp
 
 LICENSE=	GPLv2 # (or later)
-
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 USE_MYSQL=	yes
@@ -20,12 +19,17 @@ USE_XORG=	xpm
 ALL_TARGET=	clean all
 MAKE_JOBS_UNSAFE=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/src
+
 CPPFLAGS+=	-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib
 
 PORTDOCS=	README
 PLIST_FILES=	bin/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 .for i in Makefile jDockApp/Makefile xutils/Makefile
 	@${REINPLACE_CMD} -e \
@@ -34,17 +38,19 @@ post-patch:
 		 /^CC/d ; \
 		 /^CFLAGS/d ; \
 		 s| make | $$(MAKE) | ; \
-		 s|-D$$(shell echo `uname -s`)||' ${WRKSRC}/${i}
+		 s|-D$$(shell echo `uname -s`)||' ${BUILD_WRKSRC}/${i}
 .endfor
 .for i in wmjsql.jet ../README
 	@${REINPLACE_CMD} -E 's|\.wmjsql([^r])|\.wmjsqlrc\1|' \
-		${WRKSRC}/${i}
+		${BUILD_WRKSRC}/${i}
 .endfor
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/.. && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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