Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Dec 2014 16:04:26 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373966 - head/emulators/dynamips-devel
Message-ID:  <201412041604.sB4G4Qw5098220@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Dec  4 16:04:25 2014
New Revision: 373966
URL: https://svnweb.freebsd.org/changeset/ports/373966
QAT: https://qat.redports.org/buildarchive/r373966/

Log:
  - Fix always true conditions

Modified:
  head/emulators/dynamips-devel/Makefile

Modified: head/emulators/dynamips-devel/Makefile
==============================================================================
--- head/emulators/dynamips-devel/Makefile	Thu Dec  4 16:04:00 2014	(r373965)
+++ head/emulators/dynamips-devel/Makefile	Thu Dec  4 16:04:25 2014	(r373966)
@@ -21,7 +21,8 @@ USES=		gmake
 ALL_TARGET=	${PORTNAME} nvram_export
 MAKE_ENV=	DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\
-		PTHREAD_LIBS=${PTHREAD_LIBS}
+		PTHREAD_LIBS=${PTHREAD_LIBS} \
+		HAS_POSIX_MEMALIGN=1
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/${PORTNAME} bin/nvram_export
@@ -43,19 +44,6 @@ DYNAMIPS_ARCH=	"amd64"
 DYNAMIPS_ARCH=	"nojit"
 .endif
 
-# It required libpcap version 0.9.4 or is higher.
-.if ${OSVERSION} < 700021
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
-MAKE_ENV+=	PCAP_LIB=${LOCALBASE}/lib/libpcap.a
-#.warning Do not overlook, make libpcap with LIBPCAP_OVERWRITE_BASE parameter, for use with shared library.
-#LIB_DEPENDS+=	pcap.\(0.9.\)?[2-9]:${PORTSDIR}/net/libpcap
-#MAKE_ENV+=	PCAP_LIB=-lpcap.2
-.endif
-
-.if ${OSVERSION} >= 700013
-MAKE_ENV+=	HAS_POSIX_MEMALIGN=1
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/nvram_export ${STAGEDIR}${PREFIX}/bin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412041604.sB4G4Qw5098220>