*** ./src/wcd.c.ORIG	Tue Oct  8 11:12:17 2013
--- ./src/wcd.c	Tue Oct  8 11:12:39 2013
***************
*** 37,42 ****
--- 37,43 ----
  
  #include <stdio.h>
  #include <stdlib.h>
+ #include <stdarg.h>
  #include <errno.h>
  #include <string.h>
  #include <ctype.h>
*** ./src/Makefile.ORIG	Mon May 27 23:44:18 2019
--- ./src/Makefile	Tue May 28 00:26:53 2019
***************
*** 43,49 ****
  
  .PRECIOUS: %.1 %.pod
  
! CC              ?= gcc
  STATIC          =
  STRIP           = strip
  
--- 43,49 ----
  
  .PRECIOUS: %.1 %.pod
  
! CC              = cc_r -qcpluscmt
  STATIC          =
  STRIP           = strip
  
***************
*** 50,60 ****
  ENABLE_NLS = 1
  
  PACKAGE         = wcd
! EXT             = .exe
  PROGRAM         = $(PACKAGE)$(EXT)
  BIN             = $(PROGRAM)
  
! PREFIX          = /usr
  prefix          = $(PREFIX)
  exec_prefix     = $(prefix)
  bindir          = $(exec_prefix)/bin
--- 50,60 ----
  ENABLE_NLS = 1
  
  PACKAGE         = wcd
! EXT             =
  PROGRAM         = $(PACKAGE)$(EXT)
  BIN             = $(PROGRAM)
  
! PREFIX          = /opt/freeware
  prefix          = $(PREFIX)
  exec_prefix     = $(prefix)
  bindir          = $(exec_prefix)/bin
***************
*** 67,73 ****
  sysconfdir      = /etc
  
  # 1 = regular, 5 = conf, 6 = games, 8 = daemons
! mandir          = $(datarootdir)/man
  man1dir         = $(mandir)/man1
  
  
--- 67,73 ----
  sysconfdir      = /etc
  
  # 1 = regular, 5 = conf, 6 = games, 8 = daemons
! mandir          = $(prefix)/man
  man1dir         = $(mandir)/man1
  
  
***************
*** 137,143 ****
  wcd_os := $(shell uname)
  
  # Enble Unicode
! UCS = 1
  ifdef WCD_UTF8
          # WCD_UTF8 was used in older versions.
          UCS=1
--- 137,143 ----
  wcd_os := $(shell uname)
  
  # Enble Unicode
! UCS = 0
  ifdef WCD_UTF8
          # WCD_UTF8 was used in older versions.
          UCS=1
***************
*** 148,154 ****
  
  
  ZIPOBJ          = bin/$(BIN) \
!                   share/man/man1/$(PACKAGE).1 \
                    share/doc/$(docsubdir)/*.* \
                    $(ZIPOBJ_EXTRA)
  
--- 148,154 ----
  
  
  ZIPOBJ          = bin/$(BIN) \
!                   man/man1/$(PACKAGE).1 \
                    share/doc/$(docsubdir)/*.* \
                    $(ZIPOBJ_EXTRA)
  
***************
*** 157,163 ****
  ifdef ENABLE_NLS
          INSTALL_TARGETS += install-mo
          ZIPOBJ += share/locale/*/LC_MESSAGES/$(PACKAGE).mo
!         ZIPOBJ += share/man/*/man1/$(PACKAGE).1
          ZIPOBJ += share/doc/$(docsubdir)/*/*
  endif
  
--- 157,163 ----
  ifdef ENABLE_NLS
          INSTALL_TARGETS += install-mo
          ZIPOBJ += share/locale/*/LC_MESSAGES/$(PACKAGE).mo
!         ZIPOBJ += man/*/man1/$(PACKAGE).1
          ZIPOBJ += share/doc/$(docsubdir)/*/*
  endif
  
***************
*** 167,174 ****
  
  # ......................................................... OS flags ...
  
! OS =
  
  ifndef OS
  ifeq ($(findstring CYGWIN,$(wcd_os)),CYGWIN)
          OS = cygwin
--- 167,179 ----
  
  # ......................................................... OS flags ...
  
! OS = aix
  
+ ifeq (aix,$(OS))
+       UCS =
+       LDFLAGS_EXTRA = -L/opt/freeware/lib -lintl
+ endif
+ 
  ifndef OS
  ifeq ($(findstring CYGWIN,$(wcd_os)),CYGWIN)
          OS = cygwin
***************
*** 309,319 ****
  # .......................................................... unicode ...
  
  ifdef UCS
!         CFLAGS_UCS = -std=gnu99
          WDEFS      = -DWCD_UNICODE
  endif
  ifdef UNINORM
!         CFLAGS_UCS = -std=gnu99
          WDEFS      = -DWCD_UNICODE -DWCD_UNINORM
          LIB_UNISTRING  = -lunistring
  endif
--- 314,324 ----
  # .......................................................... unicode ...
  
  ifdef UCS
!         CFLAGS_UCS =
          WDEFS      = -DWCD_UNICODE
  endif
  ifdef UNINORM
!         CFLAGS_UCS =
          WDEFS      = -DWCD_UNICODE -DWCD_UNINORM
          LIB_UNISTRING  = -lunistring
  endif
***************
*** 330,336 ****
  ifdef UCS
          CURSES = ncursesw
  else
!         CURSES = ncurses
  endif
  
  
--- 335,341 ----
  ifdef UCS
          CURSES = ncursesw
  else
!         CURSES = curses
  endif
  
  
***************
*** 422,428 ****
  ifeq ($(DEBUG), 1)
  CFLAGS_OPT = -O0
  else
! CFLAGS_OPT = -O2
  endif
  
  CFLAGS  ?=
--- 427,433 ----
  ifeq ($(DEBUG), 1)
  CFLAGS_OPT = -O0
  else
! CFLAGS_OPT = -O3 -qstrict
  endif
  
  CFLAGS  ?=
***************
*** 430,436 ****
  ifeq ($(DEBUG), 1)
          CFLAGS += -g
  endif
! CFLAGS  += -Wall -Wextra -Wno-unused-parameter -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
  
  
  EXTRA_CFLAGS    = -Ic3po \
--- 435,441 ----
  ifeq ($(DEBUG), 1)
          CFLAGS += -g
  endif
! CFLAGS  += $(CPPFLAGS) $(CFLAGS_USER)
  
  
  EXTRA_CFLAGS    = -Ic3po \
***************
*** 445,451 ****
                    -DDEBUG=$(DEBUGMSG)
  
  ifdef LFS
!         EXTRA_CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
  endif
  
  ifdef ASCII_TREE
--- 450,456 ----
                    -DDEBUG=$(DEBUGMSG)
  
  ifdef LFS
!         EXTRA_CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
  endif
  
  ifdef ASCII_TREE
***************
*** 458,465 ****
  
  LDFLAGS_USER   =
  LDFLAGS ?=
! LDFLAGS += $(RPM_LD_FLAGS) \
!            $(LDFLAGS_EXTRA) \
             $(NLFLAG) \
             $(LDFLAG_STATIC) \
             $(LDFLAGS_USER)
--- 463,469 ----
  
  LDFLAGS_USER   =
  LDFLAGS ?=
! LDFLAGS += $(LDFLAGS_EXTRA) \
             $(NLFLAG) \
             $(LDFLAG_STATIC) \
             $(LDFLAGS_USER)
***************
*** 569,575 ****
  	pod2text $< > $@
  
  %.ps : %.1
! 	groff -man $< -T ps > $@
  
  %.$(HTMLEXT) : %.pod
  	PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(VERSION) - Wherever Change Directory" $< > $@
--- 573,579 ----
  	pod2text $< > $@
  
  %.ps : %.1
! 	groff -mandoc $< -T ps > $@
  
  %.$(HTMLEXT) : %.pod
  	PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(VERSION) - Wherever Change Directory" $< > $@