Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Apr 2021 16:19:12 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 480905c5f11f - main - x11-wm/compiz-plugins-unsupported: minor fixes
Message-ID:  <202104131619.13DGJCGY057535@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=480905c5f11facc44cc2adc33178a2cb1e79a13d

commit 480905c5f11facc44cc2adc33178a2cb1e79a13d
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-04-12 19:27:42 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2021-04-13 16:18:05 +0000

    x11-wm/compiz-plugins-unsupported: minor fixes
    
    - Fix build without NLS
    - Remove unneeded gl dependency
    - Switch to USES=localbase
    - Remove redundant OPTIONS_DEFAULT=NLS
    
    Approved by:    portmgr blanket
---
 x11-wm/compiz-plugins-unsupported/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 287a82651126..a19accb40fa0 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gl gmake gnome libtool:keepla pathfix pkgconfig tar:bzip2 xorg
-USE_GL=		yes
+USES=		gettext-tools gmake gnome libtool:keepla localbase:ldflags pathfix \
+		pkgconfig tar:bzip2 xorg
 USE_GNOME=	gconf2 intltool libxslt
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr
 USE_LDCONFIG=	yes
@@ -37,14 +37,11 @@ GCONF_SCHEMAS=	compiz-atlantis.schemas \
 		compiz-snow.schemas \
 		compiz-tile.schemas
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-schemas
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
 
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext-runtime gettext-tools
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>



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