From 112bb61d63b8394651a2805f26bed0b06f254422 Mon Sep 17 00:00:00 2001 From: jolan Date: Sun, 20 Jun 2004 01:25:42 +0000 Subject: [PATCH] hppa linking issue is gone w/gcc3 --- net/nmap/Makefile | 7 +------ net/nmap/patches/hppa-patch-Makefile_in | 12 ------------ 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 net/nmap/patches/hppa-patch-Makefile_in diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 4789e2c5333..e22e25b8633 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2004/05/16 08:38:12 jolan Exp $ +# $OpenBSD: Makefile,v 1.50 2004/06/20 01:25:42 jolan Exp $ COMMENT= "scan ports and fingerprint stack of network hosts" @@ -23,11 +23,6 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/nbase \ ${WRKSRC}/nsock/src \ ${WRKSRC}/libpcap-possiblymodified -# XXX workaround linking issue on hppa -.if ${MACHINE_ARCH:Mhppa} -PATCH_LIST= patch-* hppa-* -.endif - FLAVORS= no_x11 FLAVOR?= diff --git a/net/nmap/patches/hppa-patch-Makefile_in b/net/nmap/patches/hppa-patch-Makefile_in deleted file mode 100644 index 47709da9418..00000000000 --- a/net/nmap/patches/hppa-patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: hppa-patch-Makefile_in,v 1.1 2004/05/16 08:38:12 jolan Exp $ ---- Makefile.in.orig 2004-01-18 05:38:38.000000000 -0600 -+++ Makefile.in 2004-05-16 02:29:32.000000000 -0500 -@@ -55,7 +55,7 @@ all: $(TARGET) $(TARGETNMAPFE) - $(TARGET): $(DEPS) @PCAP_DEPENDS@ @PCRE_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(OBJS) - @echo Compiling nmap - rm -f $@ -- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lssl -lcrypto - - # This empty rule is used to force execution of certain rules where I can't conveniently specify - # all of the prerequisites (e.g. recursive makes and such)