Honor CFLAGS passed in from environment during build, some minor cosmetic

changes to the Makefile, and mark as USE_BUILDLINK_ONLY.

3 files changed, 18 insertions, 22 deletions

diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index ab64ea1e7bb..be876a1ad42 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/03/31 13:39:32 zuntum Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/28 20:20:48 jlam Exp $
 #
 
 DISTNAME=	export.socks.cstc.4.2.2
 PKGNAME=	socks4-2.2
+WRKSRC=		${WRKDIR}/socks.cstc.4.2
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.nec.com/pub/socks/socks4/
 
@@ -12,20 +13,18 @@ COMMENT=	Old library, server and client for using proxy firewall software
 
 CONFLICTS=	socks5-*
 
-RESTRICTED=	"no commercial use"
+RESTRICTED=		"no commercial use"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}/socks.cstc.4.2
-
-NO_CONFIGURE=	yes
-
-.include "../../mk/bsd.prefs.mk"
+USE_BUILDLINK_ONLY=	# defined
+MAKE_ENV+=		OPTIMIZE="${CFLAGS}"
 
 post-patch:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/include/socks.h \
-		> ${WRKSRC}/include/socks.h.new && \
-		${MV} ${WRKSRC}/include/socks.h.new ${WRKSRC}/include/socks.h
+	@cd ${WRKSRC};							\
+	${SED} -e "s|@PREFIX@|${PREFIX}|g"				\
+		include/socks.h > ${WRKSRC}/include/socks.h.new;	\
+	${MV} include/socks.h.new include/socks.h
 	@${ECHO} "sockd 0.0.0.0 0.0.0.0" >> ${WRKSRC}/socks.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/socks4/distinfo b/net/socks4/distinfo
index c013d4e5cf9..6cb44c81a8d 100644
--- a/net/socks4/distinfo
+++ b/net/socks4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:33 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/28 20:20:49 jlam Exp $
 
 SHA1 (export.socks.cstc.4.2.2.tar.gz) = 7d8d041c82213f9fd60f64aadf9c1ade418e15db
 Size (export.socks.cstc.4.2.2.tar.gz) = 278805 bytes
-SHA1 (patch-aa) = 6761a0f53f0845d9324d22d7b78bf665a028d08c
+SHA1 (patch-aa) = af111863aaefe008e420ee010b54591081ad81c4
 SHA1 (patch-ab) = e0206c1fece2b8ec63a7fa24b92d1b8ba3ce5c72
 SHA1 (patch-ac) = d3988d7ae5103bd7849305bb555d7cf3b1574ddc
 SHA1 (patch-ad) = 321d88cf5863f8c3f0b5b3623a1af2c4753f5eb3
diff --git a/net/socks4/patches/patch-aa b/net/socks4/patches/patch-aa
index 9331d6d0667..b734081bc49 100644
--- a/net/socks4/patches/patch-aa
+++ b/net/socks4/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1999/08/05 13:09:28 agc Exp $
+$NetBSD: patch-aa,v 1.6 2001/06/28 20:20:49 jlam Exp $
 
---- Makefile.orig	Thu Sep  7 03:24:02 1995
-+++ Makefile	Thu Aug  5 13:50:46 1999
+--- Makefile.orig	Wed Sep  6 22:24:02 1995
++++ Makefile
 @@ -3,9 +3,11 @@
  
  SHELL=/bin/sh
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.5 1999/08/05 13:09:28 agc Exp $
  
  #If your system doesn't have waitpid(), uncomment the nextline:
  #NO_WAITPID=-DNO_WAITPID
-@@ -43,16 +45,16 @@
+@@ -43,15 +45,15 @@
  
  # Define RCMD and SUPPORT_RCMD if you want to support Rrcmd, which is required
  # for SOCKSified rlogin, rsh, and rcp.
@@ -39,12 +39,10 @@ $NetBSD: patch-aa,v 1.5 1999/08/05 13:09:28 agc Exp $
  
  # optimization flag for cc
 -OPTIMIZE=-g
--#OPTIMIZE=-O
 +#OPTIMIZE=-g
-+OPTIMIZE=-O
+ #OPTIMIZE=-O
  # Be careful with the OPTIMIZE flag. SunPro's SC2.0.1, for example, is
  # knwon to produce incorrect code when -O is used.
- 
 @@ -73,13 +75,13 @@
  #BIND_RESOLVER=-DBIND_RESOLVER
  
@@ -87,15 +85,14 @@ $NetBSD: patch-aa,v 1.5 1999/08/05 13:09:28 agc Exp $
  #GETPASS=
  
  # SOLARIS should use
--#CC=cc
++.if ${OPSYS} == "SunOS"
+ #CC=cc
 -#RESOLV_LIB=-lresolv -lnsl -lsocket
 -#OTHER_CFLAGS=-DSOLARIS -Dindex=strchr -Drindex=strrchr $(SHORTENED_RBIND) -DUSE_DIRENT $(GETCWD) $(FASCIST) -DCOMPAT $(TRY_PASV)
 -#RANLIB=/bin/true
 -#OS=solaris2.2
 -#INSTALL=install
 -#GETPASS=getpass.o
-+.if ${OPSYS} == "SunOS"
-+#CC=cc
 +RESOLV_LIB=-lresolv -lnsl -lsocket
 +OTHER_CFLAGS=-DSOLARIS -Dindex=strchr -Drindex=strrchr $(SHORTENED_RBIND) -DUSE_DIRENT $(GETCWD) $(FASCIST) -DCOMPAT $(TRY_PASV)
 +RANLIB=/bin/true