 @@ -1,34 +1,36 @@
-# $NetBSD: Makefile,v 1.13 2009/06/30 00:07:20 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/08 22:35:13 cheusov Exp $
+#
 DISTNAME=	statist-1.0.1
 PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.usf.uni-osnabrueck.de/~breiter/tools/statist/v${PKGVERSION}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.usf.uni-osnabrueck.de/~breiter/tools/statist/index.en.html
 COMMENT=	Small and portable statistics program
 LICENSE=	gnu-gpl-v2
 DEPENDS+=	gnuplot-[0-9]*:../../graphics/gnuplot
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+CONFIGURE_DIRS=	src
 BUILD_DIRS=	src
 USE_LIBTOOL=	YES
-INSTALLATION_DIRS=	bin lib
+AUTO_MKDIRS=	yes
 do-install:
-	cd ${WRKSRC} &&							\
+	cd ${WRKSRC}/src &&							\
-	${LIBTOOL} --mode=install					\
+	${LIBTOOL} --tag=CC --mode=install					\
 		${INSTALL_DATA} libstatist.la ${DESTDIR}${PREFIX}/lib &&\
-	${LIBTOOL} --mode=install					\
+	${LIBTOOL} --tag=CC --mode=install					\
 		${INSTALL_PROGRAM} statist ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/statist
+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps				\
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.ps				\
 		${DESTDIR}${PREFIX}/share/doc/statist
 .include "../../mk/bsd.pkg.mk"

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/03/11 12:42:41 hasso Exp $
+$NetBSD: distinfo,v 1.4 2012/09/08 22:35:13 cheusov Exp $
 SHA1 (statist-1.0.1.tar.gz) = 2900c58e730ecf93dfa3e15a881a1afca0cfdf20
 RMD160 (statist-1.0.1.tar.gz) = 1c6b16fe2dfe74ccb6fe2bd3cd6846a5e17f8025
 Size (statist-1.0.1.tar.gz) = 214635 bytes
-SHA1 (patch-aa) = 6cfe11d15d888d042b97ad1470db1405aa7bc489
+SHA1 (patch-aa) = 7c12d13664b863a75b32ff1a2baae1fcc89231fc
-SHA1 (patch-ab) = ff6424b96aa62bb79d9c6c12f01117d272d59bcd
+SHA1 (patch-ab) = bc36a9055d8a5a3f3d899e897202c1592f79a47e
-SHA1 (patch-ac) = 64ca31cb397cc5f732bdabec091279ec2ffd77a6
+SHA1 (patch-ac) = 0c610d907c14f1ae5899b2af03b95ef361aba99a

 @@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/09 09:23:24 rh Exp $
+$NetBSD: patch-aa,v 1.2 2012/09/08 22:35:13 cheusov Exp $
---- Makefile.orig	Fri Nov 16 06:22:33 2001
+--- src/Makefile.orig	2001-11-15 20:22:33.000000000 +0000
-+++ Makefile
++++ src/Makefile
 @@ -16,11 +16,11 @@
  # and now for the language setting,
  # you can add	LANG=LANG_EN or LANG=LANG_DE to the make arguments
  # Command line arguments to make override the default (which is in here)
 -LANG=LANG_DE
 +LANG=LANG_EN
  LANGUAGE=-DLANG=$(LANG)
  #decide between "main", "shlib" and "lib"
 -all: main
 +all: lib main
  #all: lib
 @@ -45,45 +45,45 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/11/09 0
 +GCFLAGS= $(COMPILERCFLAGS) $(EXTRACFLAGS) $(LANGUAGE) $(STATISTX)
  #MAIN = $(HOME)/tools/statist
  MAIN=statist
 @@ -56,9 +55,12 @@ SH_LIB = libstatist.so.1.0.1
  STAT_LIB = libstatist.a
 -OBJECTS = statist.o menue.o procs.o funcs.o data.o plot.o memory_handling.o
 +OBJECTS = statist.o ${STAT_LIB:.a=.la}
  LIB_OBJECTS = menue.o procs.o funcs.o data.o plot.o memory_handling.o
 +.c.o:
-+	${LIBTOOL} --mode=compile ${CC} ${GCFLAGS} -o ${.TARGET:.o=.lo} ${.IMPSRC}
++	${LIBTOOL} --tag=CC --mode=compile ${CC} ${GCFLAGS} -o ${.TARGET:.o=.lo} ${.IMPSRC}
++
  main:   $(MAIN)
  check: main
 @@ -73,32 +75,26 @@ lib:	$(STAT_LIB)
  $(MAIN) : $(OBJECTS) Makefile
 -	$(CC) $(LFLAGS) $(MAIN) $(OBJECTS) $(LIBS)
-+	${LIBTOOL} --mode=link ${CC} ${LFLAGS} ${MAIN} ${OBJECTS:.o=.lo} ${LIBS}
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LFLAGS} ${MAIN} ${OBJECTS:.o=.lo} ${LIBS}
  # change AB:
  $(SH_LIB):		$(LIB_OBJECTS) Makefile
  	$(CC) -shared $(LIB_OBJECTS) -o $(SH_LIB)
  $(STAT_LIB):	$(LIB_OBJECTS) Makefile
 -	 $(LIBTOOL) $(STAT_LIB) $(LIB_OBJECTS)
-+	 ${LIBTOOL} --mode=link ${CC} -o ${STAT_LIB:.a=.la} ${LIB_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
++	 ${LIBTOOL} --tag=CC --mode=link ${CC} -o ${STAT_LIB:.a=.la} ${LIB_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
  statist.o : statist.c statist.h menue.h data.h funcs.h
 -	$(CC) $(CFLAGS) statist.c
  menue.o : menue.c menue.h procs.h data.h statist.h
 -	$(CC) $(CFLAGS) menue.c
  procs.o : procs.c procs.h funcs.h statist.h
 -	$(CC) $(CFLAGS) procs.c
  funcs.o : funcs.c funcs.h statist.h
 -	$(CC) $(CFLAGS) funcs.c

 @@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2009/03/11 12:42:41 hasso Exp $
+$NetBSD: patch-ac,v 1.2 2012/09/08 22:35:13 cheusov Exp $
---- statist.h.orig	2009-03-11 14:17:03 +0200
+--- src/statist.h.orig	2009-03-11 14:17:03 +0200
-+++ statist.h		2009-03-11 14:17:45 +0200
++++ src/statist.h		2009-03-11 14:17:45 +0200
 @@ -13,6 +13,7 @@
  ***************************************************************/
  #include <stdio.h>
 +#include <errno.h>
  #include "gettext.h"
  #include "memory_handling.h"
 @@ -240,7 +241,6 @@ typedef struct {
  } SORTREC;
 -extern int errno;

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2009/03/11 12:42:41 hasso Exp $
+$NetBSD: patch-ab,v 1.2 2012/09/08 22:35:13 cheusov Exp $
---- iodefs.c.orig	2009-03-11 14:18:05 +0200
+--- src/iodefs.c.orig	2009-03-11 14:18:05 +0200
-+++ iodefs.c		2009-03-11 14:18:31 +0200
++++ src/iodefs.c		2009-03-11 14:18:31 +0200
 @@ -11,8 +11,7 @@
  #include<stdio.h>
  #include<string.h>
+-
 -extern int errno;
 +#include<errno.h>
  #define FOPEN(name, mode, fp)                                     \
    if ((fp = fopen(name, mode))==NULL) {                           \