sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove dependency on ports version of libpcap; it's no longer needed

Browse source 
and causes build problems for qemu-devel.

Submitted by:	David O'Brien <obrien@FreeBSD.org> (slightly modified)
This commit is contained in:
Edward Tomasz Napierala 2009-01-12 21:30:36 +00:00
parent ebe7f11b3a
commit 21fe6ee426
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=225881
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
emulators/simh/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= simh PORTNAME= simh
PORTVERSION= 3.8.0 PORTVERSION= 3.8.0
PORTREVISION= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= http://simh.trailing-edge.com/sources/ MASTER_SITES= http://simh.trailing-edge.com/sources/
DISTNAME= ${PORTNAME}v38-0 DISTNAME= ${PORTNAME}v38-0
@ -18,10 +19,9 @@ USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -qoa EXTRACT_BEFORE_ARGS= -qoa
USE_GMAKE= yes USE_GMAKE= yes
MAKEFILE= makefile MAKEFILE= makefile
MAKE_ENV= USE_NETWORK=1
NO_WRKSUBDIR= yes NO_WRKSUBDIR= yes
OPTIONS= NETWORK "Enable Sim_Ether module (and ports libpcap)" on
BIN_FILES= altair altairz80 gri h316 hp2100 i1401 i1620 i7094 ibm1130 \ BIN_FILES= altair altairz80 gri h316 hp2100 i1401 i1620 i7094 ibm1130 \
id16 id32 lgp nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 \ id16 id32 lgp nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 \
s3 sds vax vax780 s3 sds vax vax780
@ -35,13 +35,6 @@ SUB_FILES+= pkg-message
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
# XXX How do we know that libpcap.a is really the correct >0.9.x version?!
.if defined (WITH_NETWORK)
RUN_DEPENDS= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
BUILD_DEPENDS= ${RUN_DEPENDS}
MAKE_ENV= USE_NETWORK=1
.endif
pre-patch: pre-patch:
@${MKDIR} ${WRKSRC}/BIN @${MKDIR} ${WRKSRC}/BIN

10
emulators/simh/files/patch-makefile
View file

@ -1,6 +1,6 @@
--- makefile.orig 2008-06-06 15:00:46.000000000 +0200 --- makefile.orig 2008-06-06 15:00:46.000000000 +0200
+++ makefile 2008-07-22 23:16:54.000000000 +0200 +++ makefile 2009-01-12 21:12:48.000000000 +0100
@@ -9,10 +9,10 @@ @@ -9,13 +9,13 @@
ifneq (,$(findstring darwin,$(OSTYPE))) ifneq (,$(findstring darwin,$(OSTYPE)))
OS_CCDEFS = -D_GNU_SOURCE OS_CCDEFS = -D_GNU_SOURCE
else else
@ -12,4 +12,8 @@
+ CC += ${CFLAGS} $(OS_CCDEFS) -I . + CC += ${CFLAGS} $(OS_CCDEFS) -I .
ifeq ($(USE_NETWORK),) ifeq ($(USE_NETWORK),)
else else
NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a - NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
+ NETWORK_OPT = -DUSE_NETWORK -lpcap
endif
else
#Win32 Environments