 @@ -1,143 +1,143 @@
-$NetBSD: patch-aa,v 1.9 2014/01/15 16:23:31 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
 --- Makefile.orig	2013-09-01 23:02:02.000000000 +0000
 +++ Makefile
 @@ -585,7 +585,7 @@ HAVE_UNUSED=
  #INCDIR= /usr/local/include
  #INCDIR= /dev/env/DJDIR/include
 -INCDIR= /usr/include
 +INCDIR= ${PREFIX}/include
  # Where to install calc related things
+ #
 @@ -624,15 +624,15 @@ INCDIR= /usr/include
+ #
  #BINDIR= /usr/local/bin
  #BINDIR= /dev/env/DJDIR/bin
 -BINDIR= /usr/bin
 +BINDIR= ${PREFIX}/bin
  #LIBDIR= /usr/local/lib
  #LIBDIR= /dev/env/DJDIR/lib
 -LIBDIR= /usr/lib
 +LIBDIR= ${PREFIX}/lib
  #CALC_SHAREDIR= /usr/local/lib/calc
  #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
 -CALC_SHAREDIR= /usr/share/calc
 +CALC_SHAREDIR= ${PREFIX}/share/calc
  # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
  #	Always be sure that the CALC_INCDIR path ends in /calc to avoid
 @@ -710,7 +710,7 @@ T=
  #MANDIR=
  #MANDIR= /usr/local/man/man1
  #MANDIR= /usr/man/man1
 -MANDIR= /usr/share/man/man1
-+MANDIR= ${PREFIX}/man/man1
++MANDIR= ${PREFIX}/${PKGMANDIR}/man1
  #MANDIR= /dev/env/DJDIR/man/man1
  #MANDIR= /usr/man/u_man/man1
  #MANDIR= /usr/contrib/man/man1
 @@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1
+ #
  # Use CATDIR= to disable installation of the calc cat (formatted) page.
+ #
 -CATDIR=
 +CATDIR= ${PREFIX}/man/cat1
  #CATDIR= /usr/local/man/cat1
  #CATDIR= /usr/local/catman/cat1
  #CATDIR= /usr/man/cat1
 @@ -742,9 +742,9 @@ MANEXT= 1
+ #
  # This is ignored if CATDIR is empty.
+ #
 -CATEXT= 1
 +#CATEXT= 1
  #CATEXT= 1.gz
 -#CATEXT= 0
 +CATEXT= 0
  #CATEXT= l
  # how to format a man page
 @@ -770,8 +770,8 @@ CATEXT= 1
  # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
  # lines below.
+ #
 -#NROFF= nroff
 -NROFF=
 +NROFF= nroff
 +#NROFF=
  #NROFF= groff
  NROFF_ARG= -man
  #NROFF_ARG= -mandoc
 @@ -837,13 +837,14 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
+ #
  # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+ #
 -USE_READLINE=
 -#USE_READLINE= -DUSE_READLINE
 +#USE_READLINE=
 +USE_READLINE= -DUSE_READLINE
+ #
  READLINE_LIB=
  READLINE_EXTRAS=
+ #
 -#READLINE_LIB= -lreadline
 +READLINE_LIB= -lreadline
 +READLINE_EXTRAS= -lncurses
  #READLINE_EXTRAS= -lhistory -lncurses
+ #
  #READLINE_LIB= -L/usr/gnu/lib -lreadline
 @@ -896,7 +897,7 @@ CALCPAGER= less
+ #
  #DEBUG= -O3
  #DEBUG= -O3 -g
 -DEBUG= -O3 -g3
 +#DEBUG= -O3 -g3
  #DEBUG= -O3 -ipa
  #DEBUG= -O3 -g3 -ipa
 @@ -1409,10 +1410,10 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
  # LDFLAGS for ${CC} in linking calc programs other than intermediate programs
+ #
  ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
 -CFLAGS= ${ICFLAGS} ${CCOPT}
 +CFLAGS+= ${ICFLAGS} ${CCOPT}
+ #
  ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
 -LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
 +LDFLAGS+= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+ #
  #if 0	/* start of skip for non-Gnu makefiles */
  endif
 @@ -1470,7 +1471,7 @@ endif
  # NOTE: This is the default generic host target.  Used when no other
  #	host target matches.
 -ifeq ($(target),)
 +ifeq ($(target),pkgsrc)
+ #
  BLD_TYPE= calc-static-only
+ #
 @@ -1516,7 +1517,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
  else
  ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
  endif
 -CFLAGS= ${ICFLAGS} ${CCOPT}
 +CFLAGS= ${ICFLAGS} ${CCOPT} ${CPPFLAGS}
  # Required flags to link files for calc
+ #
 @@ -4511,9 +4512,9 @@ endif
  	${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERSION}
  	${Q}#       because we only want to perform one ${LDCONFIG} for both
  	${Q}#       libcalc${LIB_EXT_VERSION} and libcustcalc${LIB_EXT_VERSION}.
 -	-${Q} if ${CMP} -s libcalc${LIB_EXT_VERSION} \
 +	-${Q} if true ${CMP} -s libcalc${LIB_EXT_VERSION} \
  		     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION} && \
 -	   ${CMP} -s custom/libcustcalc${LIB_EXT_VERSION} \
 +	   true ${CMP} -s custom/libcustcalc${LIB_EXT_VERSION} \
  		     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; then \
  	    ${TRUE}; \
  	else \

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 23:33:31 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/04/01 22:29:36 jperkin Exp $
 SHA1 (calc-2.12.4.13.tar.bz2) = 4d48fb78c903f10e9bcd05c42105498637dea834
 RMD160 (calc-2.12.4.13.tar.bz2) = c04d995a500ad7b0be27afbb6edaa6978c42437e
 SHA512 (calc-2.12.4.13.tar.bz2) = 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534
 Size (calc-2.12.4.13.tar.bz2) = 970778 bytes
-SHA1 (patch-aa) = 4cc64664e4eb3e5f1aea56f74d9615caa75483b2
+SHA1 (patch-aa) = c4a3850a2d1172174f750c795b2c77065bab6af6
 SHA1 (patch-fposval_c) = 8a8d08f8b566e583faa3bd9033c4a9ac90cb343c