Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Feb 2019 06:57:28 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491917 - in head: x11-fonts/cyberbit-ttfonts x11-themes/cursor-polar-theme x11-themes/gnome-icons-jini x11/xascii x11/xforward
Message-ID:  <201902020657.x126vSYP005717@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Feb  2 06:57:27 2019
New Revision: 491917
URL: https://svnweb.freebsd.org/changeset/ports/491917

Log:
  x11*/*: Use NO_WRKSUBDIR
  
  Move some things as suggested by the PHB.

Modified:
  head/x11-fonts/cyberbit-ttfonts/Makefile
  head/x11-themes/cursor-polar-theme/Makefile
  head/x11-themes/gnome-icons-jini/Makefile
  head/x11/xascii/Makefile
  head/x11/xforward/Makefile

Modified: head/x11-fonts/cyberbit-ttfonts/Makefile
==============================================================================
--- head/x11-fonts/cyberbit-ttfonts/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
+++ head/x11-fonts/cyberbit-ttfonts/Makefile	Sat Feb  2 06:57:27 2019	(r491917)
@@ -17,9 +17,9 @@ COMMENT=	Bitstream Cyberbit TrueType font that covers 
 RESTRICTED=	Redistribution not permitted; single user license only
 
 USES=		fonts zip
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
 
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 
 PORTDOCS=	97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \

Modified: head/x11-themes/cursor-polar-theme/Makefile
==============================================================================
--- head/x11-themes/cursor-polar-theme/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
+++ head/x11-themes/cursor-polar-theme/Makefile	Sat Feb  2 06:57:27 2019	(r491917)
@@ -12,10 +12,10 @@ DISTNAME=	27913-PolarCursorThemes
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Polar is a smooth and simple cursor set
 
-NO_BUILD=	yes
 USES=	tar:bzip2
 
-WRKSRC=		${WRKDIR}
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/polar/cursors

Modified: head/x11-themes/gnome-icons-jini/Makefile
==============================================================================
--- head/x11-themes/gnome-icons-jini/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
+++ head/x11-themes/gnome-icons-jini/Makefile	Sat Feb  2 06:57:27 2019	(r491917)
@@ -10,20 +10,22 @@ DISTNAME=	jini-icon-theme-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Jini Icons for Gnome
 
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
+USES=		gnome
 INSTALLS_ICONS=	yes
 
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
 post-extract:
-	@for FILE in ${WRKDIR}/JiniOrange/scalable/apps/haansoft-hwp.svg \
-		${WRKDIR}/JiniYellowishGreen/scalable/apps/haansoft-hwp.svg \
-		${WRKDIR}/JiniBrown/scalable/apps/haansoft-hwp.svg \
-		${WRKDIR}/JiniOrange/scalable/apps/haansoft-hwp.svg \
-		${WRKDIR}/JiniYellowishGreen/scalable/apps/haansoft-hwp.svg; do \
+	@for FILE in ${WRKSRC}/JiniOrange/scalable/apps/haansoft-hwp.svg \
+		${WRKSRC}/JiniYellowishGreen/scalable/apps/haansoft-hwp.svg \
+		${WRKSRC}/JiniBrown/scalable/apps/haansoft-hwp.svg \
+		${WRKSRC}/JiniOrange/scalable/apps/haansoft-hwp.svg \
+		${WRKSRC}/JiniYellowishGreen/scalable/apps/haansoft-hwp.svg; do \
 		${LN} -sf ../../../JiniBlueSky/scalable/apps/haansoft-hwp.svg $${FILE}; \
 	done
 
 do-install:
-	cd ${WRKDIR} && ${FIND} Jini* | ${CPIO} -pdu ${STAGEDIR}${PREFIX}/share/icons
+	cd ${WRKSRC} && ${FIND} Jini* | ${CPIO} -pdu ${STAGEDIR}${PREFIX}/share/icons
 
 .include <bsd.port.mk>

Modified: head/x11/xascii/Makefile
==============================================================================
--- head/x11/xascii/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
+++ head/x11/xascii/Makefile	Sat Feb  2 06:57:27 2019	(r491917)
@@ -7,14 +7,14 @@ CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 
-WRKSRC=		${WRKDIR}
-
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display an ASCII table in decimal, octal, and hexadecimal
 
-MAKE_ARGS+=	PREFIX=${PREFIX}
 USES=		imake
 USE_XORG=	x11 xt xaw
+
+MAKE_ARGS=	PREFIX=${PREFIX}
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/xascii man/man1/xascii.1.gz
 
 .include <bsd.port.mk>

Modified: head/x11/xforward/Makefile
==============================================================================
--- head/x11/xforward/Makefile	Sat Feb  2 06:48:37 2019	(r491916)
+++ head/x11/xforward/Makefile	Sat Feb  2 06:57:27 2019	(r491917)
@@ -8,23 +8,25 @@ MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 DISTNAME=	${PORTNAME}
 
-WRKSRC=		${WRKDIR}
-
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Provide user-level X forwarding service
 
 LICENSE_FILE=	${WRKSRC}/NOTICE
 
-MAKE_ARGS+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
-USE_XORG=	x11 xt xaw xmu xt xext sm ice xp xft xau xcb xdmcp xrender
-USES=		motif
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2
+		
+USES=		motif
+USE_XORG=	x11 xt xaw xmu xt xext sm ice xp xft xau xcb xdmcp xrender
+
+MAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/xforward man/man1/xforward.1.gz
 
 OPTIONS_DEFINE=		STATIC
+
 STATIC_ALL_TARGET=	all-static
 STATIC_INSTALL_TARGET=	install-static
 STATIC_PLIST_FILES=	bin/xforward-static



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