Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Mar 2022 14:00:06 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: de92684a7cec - main - x11-toolkits/fox14: minor cleanup
Message-ID:  <202203051400.225E06kH039065@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=de92684a7cec90085a7431f51a794bc9d5749af9

commit de92684a7cec90085a7431f51a794bc9d5749af9
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-04-13 16:14:18 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-03-05 13:59:38 +0000

    x11-toolkits/fox14: minor cleanup
---
 x11-toolkits/fox14/Makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 4c7cc0c810d8..5bbe003304b5 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -22,8 +22,8 @@ MAJORVER=	${PORTVERSION:R}
 SHVER=		${PORTVERSION:S/${MAJORVER}.//}
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
-USES=		gl jpeg libtool
-USE_GL=		yes
+USES=		gl jpeg libtool localbase:ldflags
+USE_GL=		gl glu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=yes \
 		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER} \
@@ -31,9 +31,6 @@ CONFIGURE_ARGS=	--with-opengl=yes \
 USE_LDCONFIG=	yes
 PORTDOCS=	*
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS CUPS DEBUG APPS PROFILE SHM XFT DOCS
 OPTIONS_DEFAULT=SHM XFT
 APPS_DESC=	Install sample applications
@@ -113,20 +110,20 @@ post-patch:
 	@${REINPLACE_CMD} -E -e \
 		's|^(screenshotsdir).*$$|\1=${DOCSDIR}/html|' \
 		${WRKSRC}/doc/screenshots/Makefile.in
-.if ${PORT_OPTIONS:MDOCS} == ""
+
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s/ doc//' \
 		${WRKSRC}/Makefile.in
-.endif
-.if ${PORT_OPTIONS:MAPPS} == ""
+
+post-patch-APPS-off:
 	@${REINPLACE_CMD} -E -e \
 		's,^(SUBDIRS.*)adie,\1,; \
 		s,^(SUBDIRS.*)pathfinder,\1,; \
 		s,^(SUBDIRS.*)calculator,\1,' \
 		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>



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