conf/189156: include/Makefile does not honor MK_GSSAPI == no

[Garrett Cooper]

>Number:         189156
>Category:       conf
>Synopsis:       include/Makefile does not honor MK_GSSAPI == no
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 01 00:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        11.0-CURRENT
>Organization:
n/a
>Environment:
>Description:
I keep on running into ports/181004 because include/Makefile keeps on installing gssapi's headers. This is because include/Makefile does not honor MK_GSSAPI == no:

  9 SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
 10 INCS=   a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
 11         db.h \
 12         dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
 13         fts.h ftw.h getopt.h glob.h grp.h gssapi.h \


>How-To-Repeat:
This should print out nothing:

% make -VSUBDIR -VINCS | grep gssapi

This should print out everything:

% make -VSUBDIR -VINCS -DWITH_GSSAPI | grep gssapi 

Example:

% make -VSUBDIR -VINCS | grep gssapi
% make -VSUBDIR -VINCS -DWITH_GSSAPI | grep gssapi
arpa protocols rpcsvc rpc xlocale gssapi
a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h  db.h  dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h  fts.h ftw.h getopt.h glob.h grp.h  ieeefp.h ifaddrs.h  inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h  locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h  ndbm.h netconfig.h  netdb.h nl_types.h nlist.h nss.h nsswitch.h paths.h  printf.h proc_service.h pthread.h  pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h  res_update.h resolv.h runetype.h search.h semaphore.h setjmp.h  signal.h spawn.h stab.h stdalign.h stdbool.h stddef.h  stdnoreturn.h stdio.h stdlib.h string.h stringlist.h  strings.h sysexits.h tar.h termios.h tgmath.h  time.h timeconv.h timers.h ttyent.h  uchar.h ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h  wchar.h wctype.h wordexp.h xlocale.h vis.h gssapi.h iconv.h osreldate.h
>Fix:


Patch attached with submission follows:

>From c4b596a590b8687cbef6d2d6e4c19e9a5f88f8a5 Mon Sep 17 00:00:00 2001
From: Garrett Cooper <yanegomi at gmail.com>
Date: Wed, 30 Apr 2014 16:55:25 -0700
Subject: [PATCH] Make include/Makefile honor MK_GSSAPI == no

Add necessary entries to OptionalObsoleteFiles.inc
---
 include/Makefile                         | 9 +++++++--
 tools/build/mk/OptionalObsoleteFiles.inc | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/Makefile b/include/Makefile
index fd2940e..247ed1a 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -6,11 +6,11 @@
 .include <bsd.own.mk>
 
 CLEANFILES= osreldate.h version vers.c
-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
+SUBDIR= arpa protocols rpcsvc rpc xlocale
 INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
 	db.h \
 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
-	fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+	fts.h ftw.h getopt.h glob.h grp.h \
 	ieeefp.h ifaddrs.h \
 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
 	locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
@@ -62,6 +62,11 @@ LSUBSUBDIRS=	dev/mpt/mpilib
 _dev_powermac_nvram=	dev/powermac_nvram
 .endif
 
+.if ${MK_GSSAPI} != "no"
+SUBDIR+=	gssapi
+INCS+=		gssapi.h
+.endif
+
 .if ${MK_GPIB} != "no"
 _dev_ieee488=	dev/ieee488
 .endif
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index d787cb9..0932037 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1833,6 +1833,9 @@ OLD_DIRS+=usr/share/tmac
 .endif
 
 .if ${MK_GSSAPI} == no
+OLD_FILES+=usr/include/gssapi.h
+OLD_FILES+=usr/include/gssapi/gssapi.h
+OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
-- 
1.8.5.2



>Release-Note:
>Audit-Trail:
>Unformatted: