devel/imake-cf: use gccmakedep on all architectures

Previously, gccmakedep(1) was incidentally enabled by way of including
<xorg.cf> on those architectures for which an old configuration
existed for building the X11 server.  Other archs would fall back
to using makedepend(1) for Makefile dependency generation.

ok tb@ phessler@
This commit is contained in:
naddy 2022-11-24 20:24:21 +00:00
parent 57da22003e
commit 4cf496ad04
2 changed files with 14 additions and 5 deletions

View File

@ -4,6 +4,7 @@ CATEGORIES = devel x11
V = 1.0.7
DISTNAME = xorg-cf-files-${V}
PKGNAME = imake-cf-${V}
REVISION = 0
MASTER_SITES = ${MASTER_SITE_XORG:=util/}
PERMIT_PACKAGE = Yes

View File

@ -33,7 +33,15 @@ Index: OpenBSD.cf
#define BuildHtmlManPages NO
#endif
@@ -172,6 +174,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
@@ -150,6 +152,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
+#define UseGccMakeDepend YES
#define UseGnuMalloc NO
@@ -172,6 +175,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#ifndef CcCmd
#define CcCmd cc
#endif
@ -43,7 +51,7 @@ Index: OpenBSD.cf
#ifndef AsCmd
#define AsCmd cc -c -x assembler
#endif
@@ -244,9 +249,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
@@ -244,9 +250,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
/*
* Documentation formatting
*/
@ -69,7 +77,7 @@ Index: OpenBSD.cf
#define HasGroff YES
#ifndef HasCookieMaker
@@ -262,77 +280,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
@@ -262,77 +281,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
*/
#define ManSuffix 1
#define FileManSuffix 5
@ -153,7 +161,7 @@ Index: OpenBSD.cf
done
#define InstallManPageAliases(file,destdir,aliases) @@\
@@ -436,8 +392,6 @@ install:: fonts.alias @@\
@@ -436,8 +393,6 @@ install:: fonts.alias @@\
#ifdef AMD64Architecture
# define HasWeakSymbols YES
@ -162,7 +170,7 @@ Index: OpenBSD.cf
# define XorgServer YES
@@ -666,51 +620,26 @@ install:: fonts.alias @@\
@@ -666,51 +621,26 @@ install:: fonts.alias @@\
/*