>Number:         28792
>Category:       pkg
>Synopsis:       devel/anjuta doesn't build on -current
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 27 22:48:00 +0000 2004
>Originator:     martijnb@atlas.ipv6.stack.nl
>Release:        NetBSD 2.99.11
>Organization:
	
>Environment:
	
	
System: NetBSD atlas.ipv6.stack.nl 2.99.11 NetBSD 2.99.11 (ATLAS) #11: Tue Dec 14 15:38:53 CET 2004 martijnb@atlas.ipv6.stack.nl:/usr/src/sys/arch/i386/compile/ATLAS i386
Architecture: i386
Machine: i386
>Description:
       devel/anjuta doesn't build. This is basicly a duplicate of pkg/29791,
       as anjuta seems to contain an integral copy of exctags.
>How-To-Repeat:
       Try to build anjuta on a -current NetBSD machine.
>Fix:
       Same problem, same fix:

Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/devel/anjuta/distinfo,v
retrieving revision 1.8
diff -r1.8 distinfo
6a7
> SHA1 (patch-ac) = f36cfa3c5852e9d8d9a065cad5c92e01f986e68d
7a9,15
> SHA1 (patch-ae) = 0177b5099f86f57234e7ce8d872e0107c2d9232d
> SHA1 (patch-af) = d46d54bca693605aa0c99bca297df52b290d1af0
> SHA1 (patch-ag) = b8d1ad0cc866a8874615d6eeaaad51e470f975c9
> SHA1 (patch-ah) = 89316869a99d05d1287713aa0903b1d20f7f4c49
> SHA1 (patch-ai) = bb51b04c7af4142835222752b5b8ad7a97d15777
> SHA1 (patch-aj) = c354aac855feb3ec90e82535602c254889b8fa6e
> SHA1 (patch-ak) = 0e374f333ab535c46f254be458bd218d1dec6260
8a17
> SHA1 (patch-am) = 68da602d500038eb0ccb6b035a0f72cbf33dec78
9a19,20
> SHA1 (patch-ao) = ab5493c4dfff31563059fd6cc731bd1d8a8f441e
> SHA1 (patch-ap) = 3d6f49dc013ac04f8bb84e6c4437a1610939e226
10a22,25
> SHA1 (patch-ar) = f755b50ccf686c247e43fbed6c6e10e880ed7017
> SHA1 (patch-as) = d61611902212a5f495ef29d1e9b2ddd783bf6d5f
> SHA1 (patch-at) = 8451e7878288bca50ca3b1aeeb3b744fb116f82b
> SHA1 (patch-au) = 7499297bc90c6e7abc00b187752ce6fd4d19113e
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
0a1,22
> $NetBSD$
> 
> --- tagmanager/c.c.orig	2003-05-06 10:05:58.000000000 +0200
> +++ tagmanager/c.c
> @@ -558,7 +558,7 @@ static const char *keywordString (const 
>      return name;
>  }
>  
> -static void __unused__ pt (tokenInfo *const token)
> +static void _exctags_unused_ pt (tokenInfo *const token)
>  {
>      if (isType (token, TOKEN_NAME))
>  	printf ("type: %-12s: %-13s   line: %lu\n",
> @@ -573,7 +573,7 @@ static void __unused__ pt (tokenInfo *co
>  	       tokenString (token->type), token->lineNumber);
>  }
>  
> -static void __unused__ ps (statementInfo *const st)
> +static void _exctags_unused_ ps (statementInfo *const st)
>  {
>      unsigned int i;
>      printf ("scope: %s   decl: %s   gotName: %s   gotParenName: %s\n",
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
0a1,22
> $NetBSD$
> 
> --- tagmanager/ctags.c.orig	2002-12-24 15:34:02.000000000 +0100
> +++ tagmanager/ctags.c
> @@ -891,7 +891,7 @@ extern vString *combinePathAndFile (cons
>   *	Create tags
>   */
>  
> -extern void processExcludeOption (const char *const __unused__ option,
> +extern void processExcludeOption (const char *const _exctags_unused_ option,
>  				  const char *const parameter)
>  {
>      if (parameter [0] == '\0')
> @@ -1327,7 +1327,7 @@ static void setExecutableName (const cha
>  #endif
>  }
>  
> -extern int ctags_main (int __unused__ argc, char **argv)
> +extern int ctags_main (int _exctags_unused_ argc, char **argv)
>  {
>      cookedArgs *args;
>  #ifdef VMS
Index: patches/patch-af
===================================================================
RCS file: patches/patch-af
diff -N patches/patch-af
0a1,13
> $NetBSD$
> 
> --- tagmanager/debug.h.orig	2002-12-24 15:34:02.000000000 +0100
> +++ tagmanager/debug.h
> @@ -56,7 +56,7 @@ enum eDebugLevels {
>  *   Function prototypes
>  */
>  extern void lineBreak (void);
> -extern void debugPrintf (const enum eDebugLevels level, const char *const format, ...) __printf__ (2, 3);
> +extern void debugPrintf (const enum eDebugLevels level, const char *const format, ...) _exctags_printf_ (2, 3);
>  extern void debugPutc (const int level, const int c);
>  extern void debugParseNest (const boolean increase, const unsigned int level);
>  extern void debugCppNest (const boolean begin, const unsigned int level);
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
0a1,20
> $NetBSD$
> 
> --- tagmanager/general.h.orig	2002-12-24 15:34:02.000000000 +0100
> +++ tagmanager/general.h
> @@ -28,11 +28,11 @@
>   *  to prevent warnings about unused variables.
>   */
>  #if (__GNUC__ > 2  ||  (__GNUC__ == 2  &&  __GNUC_MINOR__ >= 7)) && !(defined (__APPLE_CC__) || defined (__GNUG__))
> -# define __unused__	__attribute__((unused))
> -# define __printf__(s,f)  __attribute__((format (printf, s, f)))
> +# define _exctags_unused_	__attribute__((unused))
> +# define _exctags_printf_(s,f)  __attribute__((format (printf, s, f)))
>  #else
> -# define __unused__
> -# define __printf__(s,f)
> +# define _exctags_unused_
> +# define _exctags_printf_(s,f)
>  #endif
>  
>  
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
0a1,13
> $NetBSD$
> 
> --- tagmanager/lua.c.orig	2002-07-18 00:30:30.000000000 +0200
> +++ tagmanager/lua.c
> @@ -37,7 +37,7 @@ static kindOption LuaKinds [] = {
>  */
>  
>  /* for debugging purposes */
> -static void __unused__ print_string (char *p, char *q)
> +static void _exctags_unused_ print_string (char *p, char *q)
>  {
>      for ( ; p != q; p++)
>  	fprintf(stderr, "%c", *p);
Index: patches/patch-ai
===================================================================
RCS file: patches/patch-ai
diff -N patches/patch-ai
0a1,13
> $NetBSD$
> 
> --- tagmanager/main.h.orig	2002-07-18 00:30:30.000000000 +0200
> +++ tagmanager/main.h
> @@ -41,7 +41,7 @@ extern void *malloc (size_t);
>  extern void *realloc (void *ptr, size_t);
>  #endif
>  
> -extern void error (const errorSelection selection, const char *const format, ...) __printf__ (2, 3);
> +extern void error (const errorSelection selection, const char *const format, ...) _exctags_printf_ (2, 3);
>  extern FILE *tempFile (const char *const mode, char **const pName);
>  extern char* eStrdup (const char* str);
>  extern void *eMalloc (const size_t size);
Index: patches/patch-aj
===================================================================
RCS file: patches/patch-aj
diff -N patches/patch-aj
0a1,22
> $NetBSD$
> 
> --- tagmanager/options.c.orig	2003-03-19 07:46:35.000000000 +0100
> +++ tagmanager/options.c
> @@ -1126,7 +1126,7 @@ static void processFormatOption (const c
>  	error (FATAL, "Unsupported value for \"%s\" option", option);
>  }
>  
> -static void processEtagsInclude (const char *const __unused__ option,
> +static void processEtagsInclude (const char *const _exctags_unused_ option,
>  				 const char *const parameter)
>  {
>      vString *const file = vStringNewInit (parameter);
> @@ -1135,7 +1135,7 @@ static void processEtagsInclude (const c
>      stringListAdd (Option.etagsInclude, file);
>  }
>  
> -static void processFilterTerminatorOption (const char *const __unused__ option,
> +static void processFilterTerminatorOption (const char *const _exctags_unused_ option,
>  					   const char *const parameter)
>  {
>      freeString (&Option.filterTerminator);
Index: patches/patch-ak
===================================================================
RCS file: patches/patch-ak
diff -N patches/patch-ak
0a1,13
> $NetBSD$
> 
> --- tagmanager/options.h.orig	2003-03-19 07:46:35.000000000 +0100
> +++ tagmanager/options.h
> @@ -111,7 +111,7 @@ extern CONST_OPTION optionValues	Option;
>  /*
>  *   FUNCTION PROTOTYPES
>  */
> -extern void verbose (const char *const format, ...) __printf__ (1, 2);
> +extern void verbose (const char *const format, ...) _exctags_printf_ (1, 2);
>  extern void freeList (stringList** const pString);
>  extern void setDefaultTagFileName (void);
>  extern void checkOptions (void);
Index: patches/patch-am
===================================================================
RCS file: patches/patch-am
diff -N patches/patch-am
0a1,13
> $NetBSD$
> 
> --- tagmanager/parse.c.orig	2002-07-18 00:30:30.000000000 +0200
> +++ tagmanager/parse.c
> @@ -341,7 +341,7 @@ extern void freeParserResources (void)
>  */
>  
>  extern void processLanguageDefineOption (const char *const option,
> -					 const char *const __unused__ parameter)
> +					 const char *const _exctags_unused_ parameter)
>  {
>  #ifdef HAVE_REGEX
>      if (parameter [0] == '\0')
Index: patches/patch-ao
===================================================================
RCS file: patches/patch-ao
diff -N patches/patch-ao
0a1,13
> $NetBSD$
> 
> --- tagmanager/parse.h.orig	2002-07-18 00:30:30.000000000 +0200
> +++ tagmanager/parse.h
> @@ -117,7 +117,7 @@ extern boolean processRegexOption (const
>  extern void addLanguageRegex (const langType language, const char* const regex);
>  extern void addTagRegex (const langType language, const char* const regex, const char* const name, const char* const kinds, const char* const flags);
>  extern void addCallbackRegex (const langType language, const char* const regex, const char* flags, const regexCallback callback);
> -extern void disableRegexKinds (const langType __unused__ language);
> +extern void disableRegexKinds (const langType _exctags_unused_ language);
>  extern boolean enableRegexKind (const langType language, const int kind, const boolean mode);
>  extern void printRegexKindOptions (const langType language);
>  extern void freeRegexResources (void);
Index: patches/patch-ap
===================================================================
RCS file: patches/patch-ap
diff -N patches/patch-ap
0a1,87
> $NetBSD$
> 
> --- tagmanager/regex.c.orig	2002-07-18 00:30:30.000000000 +0200
> +++ tagmanager/regex.c
> @@ -490,11 +490,11 @@ extern void findRegexTags (void)
>  
>  #endif /* HAVE_REGEX */
>  
> -extern void addTagRegex (const langType __unused__ language,
> -			 const char* const __unused__ regex,
> -			 const char* const __unused__ name,
> -			 const char* const __unused__ kinds,
> -			 const char* const __unused__ flags)
> +extern void addTagRegex (const langType _exctags_unused_ language,
> +			 const char* const _exctags_unused_ regex,
> +			 const char* const _exctags_unused_ name,
> +			 const char* const _exctags_unused_ kinds,
> +			 const char* const _exctags_unused_ flags)
>  {
>  #ifdef HAVE_REGEX
>      Assert (regex != NULL);
> @@ -514,10 +514,10 @@ extern void addTagRegex (const langType 
>  #endif
>  }
>  
> -extern void addCallbackRegex (const langType __unused__ language,
> -			      const char* const __unused__ regex,
> -			      const char* const __unused__ flags,
> -			      const regexCallback __unused__ callback)
> +extern void addCallbackRegex (const langType _exctags_unused_ language,
> +			      const char* const _exctags_unused_ regex,
> +			      const char* const _exctags_unused_ flags,
> +			      const regexCallback _exctags_unused_ callback)
>  {
>  #ifdef HAVE_REGEX
>      Assert (regex != NULL);
> @@ -530,8 +530,8 @@ extern void addCallbackRegex (const lang
>  #endif
>  }
>  
> -extern void addLanguageRegex (const langType __unused__ language,
> -			      const char* const __unused__ regex)
> +extern void addLanguageRegex (const langType _exctags_unused_ language,
> +			      const char* const _exctags_unused_ regex)
>  {
>  #ifdef HAVE_REGEX
>      if (! regexBroken)
> @@ -552,7 +552,7 @@ extern void addLanguageRegex (const lang
>  */
>  
>  extern boolean processRegexOption (const char *const option,
> -				   const char *const __unused__ parameter)
> +				   const char *const _exctags_unused_ parameter)
>  {
>      boolean handled = FALSE;
>      const char* const dash = strchr (option, '-');
> @@ -574,7 +574,7 @@ extern boolean processRegexOption (const
>      return handled;
>  }
>  
> -extern void disableRegexKinds (const langType __unused__ language)
> +extern void disableRegexKinds (const langType _exctags_unused_ language)
>  {
>  #ifdef HAVE_REGEX
>      if (language <= SetUpper  &&  Sets [language].count > 0)
> @@ -588,9 +588,9 @@ extern void disableRegexKinds (const lan
>  #endif
>  }
>  
> -extern boolean enableRegexKind (const langType __unused__ language,
> -				const int __unused__ kind,
> -				const boolean __unused__ mode)
> +extern boolean enableRegexKind (const langType _exctags_unused_ language,
> +				const int _exctags_unused_ kind,
> +				const boolean _exctags_unused_ mode)
>  {
>      boolean result = FALSE;
>  #ifdef HAVE_REGEX
> @@ -610,7 +610,7 @@ extern boolean enableRegexKind (const la
>      return result;
>  }
>  
> -extern void printRegexKindOptions (const langType __unused__ language)
> +extern void printRegexKindOptions (const langType _exctags_unused_ language)
>  {
>  #ifdef HAVE_REGEX
>      if (language <= SetUpper  &&  Sets [language].count > 0)
Index: patches/patch-ar
===================================================================
RCS file: patches/patch-ar
diff -N patches/patch-ar
0a1,13
> $NetBSD$
> 
> --- tagmanager/tm_file_entry.c.orig	2004-04-09 10:08:23.000000000 +0200
> +++ tagmanager/tm_file_entry.c
> @@ -32,7 +32,7 @@ static GMemChunk *file_mem_chunk = NULL;
>  
>  #define FILE_FREE(T) g_mem_chunk_free(file_mem_chunk, (T))
>  
> -void tm_file_entry_print(TMFileEntry *entry, gpointer __unused__ user_data
> +void tm_file_entry_print(TMFileEntry *entry, gpointer _exctags_unused_ user_data
>    , guint level)
>  {
>  	guint i;
Index: patches/patch-as
===================================================================
RCS file: patches/patch-as
diff -N patches/patch-as
0a1,13
> $NetBSD$
> 
> --- tagmanager/tm_project.c.orig	2003-09-09 08:55:16.000000000 +0200
> +++ tagmanager/tm_project.c
> @@ -462,7 +462,7 @@ gboolean tm_project_save(TMProject *proj
>  }
>  
>  static void tm_project_add_file_recursive(TMFileEntry *entry
> -  , gpointer user_data, guint __unused__ level)
> +  , gpointer user_data, guint _exctags_unused_ level)
>  {
>  	TMProject *project;
>  	if (!user_data || !entry || (tm_file_dir_t == entry->type))
Index: patches/patch-at
===================================================================
RCS file: patches/patch-at
diff -N patches/patch-at
0a1,13
> $NetBSD$
> 
> --- tagmanager/tm_source_file.c.orig	2002-12-24 15:34:02.000000000 +0100
> +++ tagmanager/tm_source_file.c
> @@ -156,7 +156,7 @@ int tm_source_file_tags(const tagEntryIn
>  }
>  
>  gboolean tm_source_file_update(TMWorkObject *source_file, gboolean force
> -  , gboolean __unused__ recurse, gboolean update_parent)
> +  , gboolean _exctags_unused_ recurse, gboolean update_parent)
>  {
>  #ifdef TM_DEBUG
>  	g_message("Updating source file %s", source_file->file_name);
Index: patches/patch-au
===================================================================
RCS file: patches/patch-au
diff -N patches/patch-au
0a1,13
> $NetBSD$
> 
> --- tagmanager/tm_workspace.c.orig	2003-10-08 12:56:29.000000000 +0200
> +++ tagmanager/tm_workspace.c
> @@ -362,7 +362,7 @@ void tm_workspace_recreate_tags_array(vo
>  }
>  
>  gboolean tm_workspace_update(TMWorkObject *workspace, gboolean force
> -  , gboolean recurse, gboolean __unused__ update_parent)
> +  , gboolean recurse, gboolean _exctags_unused_ update_parent)
>  {
>  	guint i;
>  	gboolean update_tags = force;

>Unformatted: