diff options
| author | kim <kim@pkgsrc.org> | 2004-11-25 05:01:21 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2004-11-25 05:01:21 +0000 |
| commit | b683e8440b72bf7c38b251ad46572d34cc5c29d4 (patch) | |
| tree | d9a29b6626180b643b2020ea3b49fe3a79723347 /net | |
| parent | 1639662bf2e5994a092af341a6e852afc7298418 (diff) | |
| download | pkgsrc-b683e8440b72bf7c38b251ad46572d34cc5c29d4.tar.gz | |
Use the "netname" target instead of the "netbsd" target as the default,
so CFLAGS is used as set in the standard make(1) rules of the platform.
This should fix the problem that "-pipe" is not available on IRIX.
Don't use mv(1) or rm(1) when installing -- the binary should not be
there anyway when using pkgsrc.
Don't define ${INSTALL} -- it should be pointing to the BSD install(1)
already in the standard make(1) rules of the platform (or somehow
inherited from pkgsrc rules). Works for NetBSD, untested elsewhere.
Based on suggestions in PR pkg/27429 by Georg Schwarz.
Diffstat (limited to 'net')
| -rw-r--r-- | net/netname/Makefile | 4 | ||||
| -rw-r--r-- | net/netname/distinfo | 4 | ||||
| -rw-r--r-- | net/netname/patches/patch-aa | 29 |
3 files changed, 27 insertions, 10 deletions
diff --git a/net/netname/Makefile b/net/netname/Makefile index e78f5848ce7..f5d1bfb8e67 100644 --- a/net/netname/Makefile +++ b/net/netname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/21 17:10:52 martti Exp $ +# $NetBSD: Makefile,v 1.6 2004/11/25 05:01:21 kim Exp $ # DISTNAME= netname-1.7 @@ -13,7 +13,7 @@ COMMENT= Return the canonical network name of a host .if ${OPSYS} == "SunOS" ALL_TARGET= svr4 .else -ALL_TARGET= netbsd +ALL_TARGET= netname .endif INSTALL_TARGET= inst-all diff --git a/net/netname/distinfo b/net/netname/distinfo index d786cce04af..9b3759aaa41 100644 --- a/net/netname/distinfo +++ b/net/netname/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:24 wiz Exp $ +$NetBSD: distinfo,v 1.3 2004/11/25 05:01:21 kim Exp $ SHA1 (netname-1.7.tar.gz) = cc3bca5ceb11bdb05f39a9904a5b46f02e3a8dff Size (netname-1.7.tar.gz) = 2362 bytes -SHA1 (patch-aa) = d23af2fa2893be234e23ee1a665244fee7a7bb05 +SHA1 (patch-aa) = 1298987dde72085a06c742e8d259cf8dc1ace341 diff --git a/net/netname/patches/patch-aa b/net/netname/patches/patch-aa index cb531c95d25..6c1291f420a 100644 --- a/net/netname/patches/patch-aa +++ b/net/netname/patches/patch-aa @@ -1,13 +1,30 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/02/26 22:58:21 kim Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/25 05:01:21 kim Exp $ ---- Makefile.orig Mon Sep 23 19:45:25 1996 -+++ Makefile Fri Feb 26 17:53:50 1999 -@@ -9,7 +9,7 @@ - MV = mv -f - INSTALL = install +--- Makefile.orig 1999-09-14 23:15:12.000000000 -0400 ++++ Makefile 2004-11-24 23:50:46.000000000 -0500 +@@ -5,11 +5,7 @@ + # + SHELL = /bin/sh +-RM = rm -f +-MV = mv -f +-INSTALL = install +- -DEST = /usr/local +DEST = $(PREFIX) BINDIR = $(DEST)/bin MANDIR = $(DEST)/man/man$(MANEXT) MANEXT = 1 +@@ -74,12 +70,9 @@ + inst-all: install install.man + + install: +- -$(MV) $(BINDIR)/netname $(BINDIR)/netname.old +- -$(RM) $(BINDIR)/netname.old + $(INSTALL) -c -s -m 0555 netname $(BINDIR) + + install.man: +- -$(RM) $(MANDIR)/netname.$(MANEXT) + $(INSTALL) -c -m 0444 netname.man $(MANDIR)/netname.$(MANEXT) + + clean: |