Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Oct 2023 19:01:51 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b3ffd0a785eb - main - databases/gnats4: Remove USES=makeinfo
Message-ID:  <202310211901.39LJ1pjc035209@gitrepo.freebsd.org>

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

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

commit b3ffd0a785eb358e0171233ad76a613d3d58cdb0
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-10-21 17:31:38 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-10-21 19:01:37 +0000

    databases/gnats4: Remove USES=makeinfo
    
    - Distfile ships with info files and no need to regenerate these files
    - Pet portclippy
    - Utilize OPTIONSNG where applicable
---
 databases/gnats4/Makefile | 54 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 34874731cc04..50943293c96c 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -9,19 +9,19 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNATS, the GNU Problem Report Management System
 WWW=		https://www.gnu.org/software/gnats/
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BROKEN_mips=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_mips64=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_FreeBSD_12_powerpc64=	fails to build on powerpc64 elfv1: conflicting types for yy_scan_string
 
-GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo
-USE_GCC=	yes
-USERS=		gnats
-
+USES=		cpe gettext-runtime gmake
 CPE_VENDOR=	gnu
+USE_GCC=	yes
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGINSTALL=	${WRKDIR}/pkg-install
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
 
 .ifdef WANT_FREEFALL_CFG
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
@@ -32,10 +32,6 @@ WITH_ORGANIZATION=	FreeBSD
 WITH_GNATSD_SERVICE=	support
 .endif
 
-GNATSDBDIR?=		/var/db/gnats
-
-CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
-
 .ifdef WITH_SUBMITTER_ID
 CONFIGURE_ARGS+=	--with-submitter=${WITH_SUBMITTER_ID}
 .endif
@@ -48,30 +44,31 @@ CONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
 CONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
 .endif
 
-PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
+USERS=		gnats
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGMESSAGE=	${WRKDIR}/pkg-message
 INFO=		gnats-faq gnats
+PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
 PORTDOCS=	NEWS UPGRADING
 
 OPTIONS_DEFINE=	DOCS EMACS SERVER
 OPTIONS_DEFAULT=SERVER
 OPTIONS_SUB=	yes
-EMACS_USES=	emacs
+
 EMACS_DESC=	Install Emacs Lisp support file
-EMACS_VARS=	EMACS_NO_DEPENDS=yes
 SERVER_DESC=	Install the gnats server too
 
-.include <bsd.port.options.mk>
+EMACS_USES=	emacs
+EMACS_CONFIGURE_ON=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
+EMACS_PLIST_SUB_OFF=	EMACS_SITE_LISPDIR="@comment "
+EMACS_VARS=	EMACS_NO_DEPENDS=yes
+SERVER_ALL_TARGET_OFF=	all-tools
+SERVER_INSTALL_TARGET_OFF=	install-tools
 
-.if ! ${PORT_OPTIONS:MSERVER}
-ALL_TARGET=	all-tools
-INSTALL_TARGET=	install-tools
-.endif
+GNATSDBDIR?=		/var/db/gnats
 
-.if ${PORT_OPTIONS:MEMACS}
-CONFIGURE_ARGS+=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
-.else
-PLIST_SUB+=	EMACS_SITE_LISPDIR="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
@@ -87,6 +84,9 @@ pre-everything::
 	@${ECHO}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|info man|man|g' ${WRKSRC}/doc/Makefile.in
+
 pre-configure:
 	@${ECHO_CMD} 'RELEASE_TAG="\`uname -srm\`"' > ${WRKSRC}/release-info
 
@@ -100,13 +100,13 @@ post-build:
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
 
-post-install:
-.if ${PORT_OPTIONS:MSERVER}
+post-install-SERVER-on:
 	${MV} ${STAGEDIR}${ETCDIR}/databases.default \
 		${STAGEDIR}${ETCDIR}/databases.sample
 	${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
 		${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
-.endif
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 



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