summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorheinz <heinz>2003-05-24 19:31:20 +0000
committerheinz <heinz>2003-05-24 19:31:20 +0000
commitef75510bb682b959e8319af2861fe912f8368efe (patch)
tree7405672b72ebe060d859d3338d4f682a82d1777a /net
parentfd397828d8c40040fc9d3113a387fc0f29ccac4d (diff)
downloadpkgsrc-ef75510bb682b959e8319af2861fe912f8368efe.tar.gz
Replace hard-coded 'make' by 'MAKE' to make :-) this work on Solaris;
no revision bump necessary. Should really fix PR pkg/21045.
Diffstat (limited to 'net')
-rw-r--r--net/netcat/distinfo4
-rw-r--r--net/netcat/patches/patch-ae86
2 files changed, 80 insertions, 10 deletions
diff --git a/net/netcat/distinfo b/net/netcat/distinfo
index c83be8d6f7a..2a840180a6d 100644
--- a/net/netcat/distinfo
+++ b/net/netcat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/04/30 04:08:26 grant Exp $
+$NetBSD: distinfo,v 1.6 2003/05/24 19:31:20 heinz Exp $
SHA1 (nc110.tgz) = f8ec3a39796b141b6654d39b7957b863c7f79a95
Size (nc110.tgz) = 75267 bytes
@@ -6,5 +6,5 @@ SHA1 (patch-aa) = 44dc8cf9072a1c127925a4efed6bb7f1428360bc
SHA1 (patch-ab) = 73990f9a87b04fffb22b94873e3225bd8ee496b5
SHA1 (patch-ac) = 8b0c41953ab0237304a31fb999e27a51df8cb0a9
SHA1 (patch-ad) = ee5e1c6a8e3e2a239135d74dbf46fc25c8d2ec80
-SHA1 (patch-ae) = c55c885bc255f6a20aa14bda8ff8b2c25f3da810
+SHA1 (patch-ae) = 440ec46df92b0f3c8fa146bc87da62f77b48dc60
SHA1 (patch-af) = 45b3824ff84c2557b0016d97b0309d5c8b597690
diff --git a/net/netcat/patches/patch-ae b/net/netcat/patches/patch-ae
index b1d9f2f5a31..c6f647572ea 100644
--- a/net/netcat/patches/patch-ae
+++ b/net/netcat/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2003/04/30 04:08:27 grant Exp $
+$NetBSD: patch-ae,v 1.4 2003/05/24 19:31:21 heinz Exp $
---- Makefile.orig Wed Mar 20 14:16:06 1996
+--- Makefile.orig Wed Mar 20 04:16:06 1996
+++ Makefile
@@ -9,12 +9,10 @@
# pick gcc if you'd rather , and/or do -g instead of -O if debugging
@@ -24,27 +24,97 @@ $NetBSD: patch-ae,v 1.3 2003/04/30 04:08:27 grant Exp $
nc-dos:
@echo "DOS?! Maybe someday, but not now"
-@@ -56,12 +54,12 @@ sunos:
+@@ -43,11 +41,11 @@ dos:
+ XFLAGS="/AS -D__MSDOS__ -DMSDOS" o=obj
+
+ ultrix:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DULTRIX'
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DULTRIX'
+
+ # you may need XLIBS='-lresolv -l44bsd' if you have BIND 4.9.x
+ sunos:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DSUNOS' STATIC=-Bstatic \
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DSUNOS' STATIC=-Bstatic \
+ XLIBS='-lresolv'
+
+ # Pick this one ahead of "solaris" if you actually have the nonshared
+@@ -55,63 +53,63 @@ sunos:
+ # or install them, forcing you to use shared libs for any network apps.
# Kludged for gcc, which many regard as the only thing available.
solaris-static:
- make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
- CC=gcc STATIC=-static XLIBS='-lnsl -lsocket -lresolv'
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+ STATIC=-static XLIBS='-lnsl -lsocket -lresolv'
# the more usual shared-lib version...
solaris:
- make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
- CC=gcc STATIC= XLIBS='-lnsl -lsocket -lresolv'
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DSYSV=4 -D__svr4__ -DSOLARIS' \
+ STATIC= XLIBS='-lnsl -lsocket -lresolv'
aix:
- make -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
-@@ -103,7 +101,7 @@ unixware:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DAIX'
+
+ linux:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DLINUX' STATIC=-static
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DLINUX' STATIC=-static
+
+ # irix 5.2, dunno 'bout earlier versions. If STATIC='-non_shared' doesn't
+ # work for you, null it out and yell at SGI for their STUPID default
+ # of apparently not installing /usr/lib/nonshared/*. Sheesh.
+ irix:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DIRIX -DSYSV=4 -D__svr4__' \
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DIRIX -DSYSV=4 -D__svr4__' \
+ STATIC=-non_shared
+
+ osf:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DOSF' STATIC=-non_shared
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DOSF' STATIC=-non_shared
+
+ # virtually the same as netbsd/bsd44lite/whatever
+ freebsd:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' STATIC=-static
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DFREEBSD' STATIC=-static
+
+ bsdi:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DBSDI' STATIC=-Bstatic
+
+ netbsd:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DNETBSD' STATIC=-static
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DNETBSD' STATIC=-static
+
+ # finally got to an hpux box, which turns out to be *really* warped.
+ # STATIC here means "linker subprocess gets args '-a archive'" which causes
+ # /lib/libc.a to be searched ahead of '-a shared', or /lib/libc.sl.
+ hpux:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DHPUX' STATIC="-Wl,-a,archive"
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DHPUX' STATIC="-Wl,-a,archive"
+
+ # unixware from bmc@telebase.com; apparently no static because of the
+ # same idiotic lack of link libraries
+ unixware:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DUNIXWARE -DSYSV=4 -D__svr4__' \
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DUNIXWARE -DSYSV=4 -D__svr4__' \
+ STATIC= XLIBS='-L/usr/lib -lnsl -lsocket -lresolv'
# from Declan Rieb at sandia, for a/ux 3.1.1 [also suggests using gcc]:
aux:
- make -e $(ALL) $(MFLAGS) XFLAGS='-DAUX' STATIC=-static CC=gcc
-+ make -e $(ALL) $(MFLAGS) XFLAGS='-DAUX' STATIC=-static
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DAUX' STATIC=-static
# Nexstep from mudge: NeXT cc is really old gcc
next:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
+
+ # start with this for a new architecture, and see what breaks.
+ generic:
+- make -e $(ALL) $(MFLAGS) XFLAGS='-DGENERIC' STATIC=
++ ${MAKE} -e $(ALL) $(MFLAGS) XFLAGS='-DGENERIC' STATIC=
+
+ # Still at large: dgux dynix ???
+