Import of pkgsrc-2015Q1

www/micro_httpd/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2012/10/28 06:30:22 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/10/09 14:07:09 wiz Exp $
 
-DISTNAME=	micro_httpd_12dec2005
-PKGNAME=	micro_httpd-20051212
+DISTNAME=	micro_httpd_10jul2014
+PKGNAME=	micro_httpd-20140710
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/micro_httpd/
 
@@ -9,11 +9,11 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.acme.com/software/micro_httpd/
 COMMENT=	Really small HTTP server than runs from inetd(8)
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=			${WRKDIR}/micro_httpd
 NO_CONFIGURE=		yes
 
+LIBS.SunOS+=		-lnsl -lsocket
+
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:

www/micro_httpd/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/03/23 21:38:02 reed Exp $
+$NetBSD: distinfo,v 1.4 2014/07/13 14:49:13 schwarz Exp $
 
-SHA1 (micro_httpd_12dec2005.tar.gz) = 9246997f9b83cee8d1b42778d4e2f8a87b679b00
-RMD160 (micro_httpd_12dec2005.tar.gz) = d5eacf573951203aaf6040c7509e868a893869bd
-Size (micro_httpd_12dec2005.tar.gz) = 5109 bytes
-SHA1 (patch-aa) = c42274a95b90c15926c21c0d6785a8af0f01d192
+SHA1 (micro_httpd_10jul2014.tar.gz) = 9171770319a2b74a9976ff3adcdb04dff185f684
+RMD160 (micro_httpd_10jul2014.tar.gz) = b8990a06800389431d5d2545a556ee2a90c7b60b
+Size (micro_httpd_10jul2014.tar.gz) = 5253 bytes
+SHA1 (patch-aa) = 0e28f7c330a0860238e131f9e891fdf6daaaee88

www/micro_httpd/patches/patch-aa

@@ -1,16 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/09 09:44:55 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2014/07/13 14:49:14 schwarz Exp $
 
---- Makefile.orig	1999-09-17 09:17:18.000000000 +0200
-+++ Makefile
-@@ -1,11 +1,5 @@
+--- Makefile.orig	2014-07-13 16:31:48.000000000 +0200
++++ Makefile	2014-07-13 16:33:59.000000000 +0200
+@@ -1,17 +1,13 @@
  BINDIR =	/usr/local/sbin
  MANDIR =	/usr/local/man/man8
--CC =		gcc
--CFLAGS =	-O
--#CFLAGS =	-g
+-CC =		cc
+-CFLAGS =	-O -ansi -pedantic -Wall -Wno-long-long -Wmissing-prototypes -Wstrict-prototypes
 -#SYSVLIBS =	-lnsl -lsocket
--LDFLAGS =	-s ${SYSVLIBS}
--#LDFLAGS =	-g ${SYSVLIBS}
+-LDFLAGS =	-s $(SYSVLIBS)
  
  all:		micro_httpd
  
+ micro_httpd:	micro_httpd.o
+-	$(CC) micro_httpd.o $(LDFLAGS) -o micro_httpd
++	$(CC) micro_httpd.o $(LDFLAGS) $(LIBS) -o micro_httpd
+ 
+ micro_httpd.o:	micro_httpd.c
+-	$(CC) $(CFLAGS) -c micro_httpd.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c micro_httpd.c
+ 
+ install:	all
+ 	rm -f $(BINDIR)/micro_httpd