git: fa1ac95098ea - main - x11-wm/compiz-plugins-main: minor fixes

[Dmitry Marakasov]

The branch main has been updated by amdmi3:

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

commit fa1ac95098ea149545a3ecba19ff0e7b821cf865
Author:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
AuthorDate: 2021-04-13 16:12:20 +0000
Commit:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
CommitDate: 2021-04-13 16:18:05 +0000

    x11-wm/compiz-plugins-main: minor fixes
    
    - Make GL dependency more specific
    - Fix build without NLS
    - Add WWW
    - Remove redundant OPTIONS_DEFAULT=NLS
    - Switch to USES=localbase
    
    Approved by:    portmgt blanket
---
 x11-wm/compiz-plugins-main/Makefile  | 11 ++++-------
 x11-wm/compiz-plugins-main/pkg-descr |  2 ++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 2853d0af87ff..aceb92269424 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -21,10 +21,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gl gmake gnome jpeg libtool:keepla pathfix pkgconfig tar:bzip2 \
-		xorg
+USES=		gettext-tools gl gmake gnome jpeg libtool:keepla localbase:ldflags pathfix \
+		pkgconfig tar:bzip2 xorg
 USE_CSTD=	gnu89
-USE_GL=		yes
+USE_GL=		glu
 USE_GNOME=	gconf2 intltool libxslt
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr xrender
 USE_LDCONFIG=	yes
@@ -58,14 +58,11 @@ GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-vpswitch.schemas \
 		compiz-shift.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>
diff --git a/x11-wm/compiz-plugins-main/pkg-descr b/x11-wm/compiz-plugins-main/pkg-descr
index 716d90382445..aa07a447750a 100644
--- a/x11-wm/compiz-plugins-main/pkg-descr
+++ b/x11-wm/compiz-plugins-main/pkg-descr
@@ -1 +1,3 @@
 This is the main set of plugins for Compiz.
+
+WWW: https://gitlab.com/compiz/compiz-plugins-main