Added support for installation to DESTDIR and LICENSE information.

3 files changed, 58 insertions, 11 deletions

diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index c4259ddac90..fca0a9f8cd3 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/09/07 22:12:23 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/04 20:58:45 heinz Exp $
 
 DISTNAME=	socket-1.1
 CATEGORIES=	sysutils net
@@ -6,12 +6,17 @@ MASTER_SITES=	http://www.freebsd.org/~wosch/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Create tcp socket and connect to stdin/out
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_ENV+=	INSTALLBASE=${PREFIX:Q}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.socket
 PKG_SUPPORTED_OPTIONS=	inet6
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/sysutils/socket/distinfo b/sysutils/socket/distinfo
index 0ee62572b4d..ff8a44bdaed 100644
--- a/sysutils/socket/distinfo
+++ b/sysutils/socket/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/11/28 16:48:31 tv Exp $
+$NetBSD: distinfo,v 1.10 2010/02/04 20:58:45 heinz Exp $
 
 SHA1 (socket-1.1.tar.gz) = 1ada9bc6d949c303734030b3a34e2d6f0544d1db
 RMD160 (socket-1.1.tar.gz) = 9a697cbdc807223f48229caa3349cba216b5ffc0
 Size (socket-1.1.tar.gz) = 14426 bytes
-SHA1 (patch-aa) = 83b6f15cc92b6bfbed03ea5d91b56cb329957241
+SHA1 (patch-aa) = d50e202c0599105fbfd8bb446b3b30e79034111c
 SHA1 (patch-ab) = a57ef3243601007113f07493201804a6050f3182
 SHA1 (patch-ac) = 73d6cabae5eec437edf39ee1cbb8ceea8cbb9f1e
 SHA1 (patch-ad) = 034f34565952f94b4e12cf78f0bb9b5612091e4d
diff --git a/sysutils/socket/patches/patch-aa b/sysutils/socket/patches/patch-aa
index 8b0cf0f21d3..707fce764e6 100644
--- a/sysutils/socket/patches/patch-aa
+++ b/sysutils/socket/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2005/10/04 16:08:40 tron Exp $
+$NetBSD: patch-aa,v 1.7 2010/02/04 20:58:45 heinz Exp $
 
---- Makefile.orig	1992-09-10 15:59:31.000000000 +0100
-+++ Makefile	2005-10-04 17:07:16.000000000 +0100
-@@ -8,7 +8,7 @@
+--- Makefile.orig	1992-09-10 14:59:31.000000000 +0000
++++ Makefile
+@@ -8,10 +8,10 @@
  ### socket.1 in /usr/local/man/man1/socket.1
  ### Make sure the target directories exist before doing a "make install".
  
@@ -10,8 +10,50 @@ $NetBSD: patch-aa,v 1.6 2005/10/04 16:08:40 tron Exp $
 +INSTALLBASE = ${PREFIX}
  INSTALLBINPATH = $(INSTALLBASE)/bin
  INSTALLBINMODE = 755
- INSTALLMANPATH = $(INSTALLBASE)/man
-@@ -117,7 +117,7 @@
+-INSTALLMANPATH = $(INSTALLBASE)/man
++INSTALLMANPATH = $(INSTALLBASE)/$(PKGMANDIR)
+ INSTALLMANMODE = 444
+ CC = cc
+ CFLAGS  = $(SWITCHES) -O
+@@ -81,27 +81,25 @@ TAGS: $(PROGSOURCES) $(HEADERS)
+ installtargets: $(INSTALLBINPATH)/$(TARGET) installmanuals
+ 
+ $(INSTALLBINPATH)/$(TARGET): $(TARGET)
+-	@-echo "installing $(TARGET) in $(INSTALLBINPATH)"; \
+-	if [ -f $(INSTALLBINPATH)/$(TARGET) ] && \
+-	   [ ! -w $(INSTALLBINPATH)/$(TARGET) ]; \
++	@-echo "installing $(TARGET) in $(DESTDIR)$(INSTALLBINPATH)"; \
++	if [ -f $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) ] && \
++	   [ ! -w $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) ]; \
+ 	then \
+-	  chmod u+w $(INSTALLBINPATH)/$(TARGET); \
++	  chmod u+w $(DESTDIR)$(INSTALLBINPATH)/$(TARGET); \
+ 	fi; \
+-	cp $(TARGET) $(INSTALLBINPATH)/$(TARGET); \
+-	chmod $(INSTALLBINMODE) $(INSTALLBINPATH)/$(TARGET); 
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(INSTALLBINPATH)/$(TARGET)
+ 
+ installmanuals: $(MANUALS)
+ 	@-_manuals="$(MAN1)"; \
+ 	for i in $$_manuals; \
+ 	do \
+-	  echo "installing $$i in $(INSTALLMANPATH)/man1"; \
+-	  if [ -f $(INSTALLMANPATH)/man1/$$i ] && \
+-	     [ ! -w $(INSTALLMANPATH)/man1/$$i ]; \
++	  echo "installing $$i in $(DESTDIR)$(INSTALLMANPATH)/man1"; \
++	  if [ -f $(DESTDIR)$(INSTALLMANPATH)/man1/$$i ] && \
++	     [ ! -w $(DESTDIR)$(INSTALLMANPATH)/man1/$$i ]; \
+ 	  then \
+-	    chmod u+w $(INSTALLMANPATH)/man1/$$i; \
++	    chmod u+w $(DESTDIR)$(INSTALLMANPATH)/man1/$$i; \
+ 	  fi; \
+-	  cp $$i $(INSTALLMANPATH)/man1/$$i; \
+-	  chmod $(INSTALLMANMODE) $(INSTALLMANPATH)/man1/$$i; \
++	  $(BSD_INSTALL_MAN) $$i $(DESTDIR)$(INSTALLMANPATH)/man1/$$i; \
+ 	done
+ 
+ doclean:
+@@ -117,7 +115,7 @@ install: +install $(ALLTARGETS)
  clean: +clean $(ALLTARGETS)
  
  +all:
@@ -20,7 +62,7 @@ $NetBSD: patch-aa,v 1.6 2005/10/04 16:08:40 tron Exp $
  	then : ; \
  	else \
  	  $(MAKE) ALLTARGETS="subsystems targets" MAINTARGET=all \
-@@ -137,7 +137,7 @@
+@@ -137,7 +135,7 @@ clean: +clean $(ALLTARGETS)
  	fi
  
  +install:
@@ -29,7 +71,7 @@ $NetBSD: patch-aa,v 1.6 2005/10/04 16:08:40 tron Exp $
  	then : ; \
  	else \
  	  $(MAKE) ALLTARGETS="subsystems installtargets" \
-@@ -158,7 +158,7 @@
+@@ -158,7 +156,7 @@ clean: +clean $(ALLTARGETS)
  	fi
  
  +clean: