Fix build (and some cosmetic changes).

3 files changed, 6 insertions, 98 deletions

diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index 340ad92627ef..721693ca3115 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -32,18 +32,7 @@ CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP} ${CONFIGURE_TARGET}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-BROKEN=		does not compile
-.endif
-
 ALLIANCE_TOP=	${PREFIX}/alliance
-SRCDIRLIST!=	${CAT} ${FILESDIR}/srcdirs.list
-CFLAGS+=	${SRCDIRLIST:S,^,-I${WRKSRC}/,}
-LDFLAGS+=	${SRCDIRLIST:S,^,-L${WRKSRC}/,}
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=	CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=	MBK_CATAL_NAME.1 MBK_CATA_LIB.1 MBK_FILTER_SFX.1 MBK_IN_FILTER.1 \
 	MBK_IN_LO.1 MBK_IN_PH.1 MBK_OUT_FILTER.1 MBK_OUT_LO.1 MBK_OUT_PH.1 \
@@ -187,6 +176,12 @@ MAN3=	addcapa.3 addchain.3 addht.3 addhtitem.3 addlocon.3 addlofig.3 \
 MAN5=	ap.5 catal.5 prol.5 vbe.5 vhdl.5 vst.5 al.5 spi.5 ctl.5 fsm.5 pat.5 \
 	lax.5 sxlib.5 vasy.5
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800000
+BROKEN=		does not compile
+.endif
+
 pre-configure:
 	@CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
 		| ${XARGS} -n 1 ${DIRNAME}); \
diff --git a/cad/alliance/distinfo b/cad/alliance/distinfo
index 440c500a2029..bfe011595b53 100644
--- a/cad/alliance/distinfo
+++ b/cad/alliance/distinfo
@@ -1,3 +1,2 @@
-MD5 (alliance-5.0-20090901.tar.gz) = f3b692c4ea9e54c040280f660b3cf170
 SHA256 (alliance-5.0-20090901.tar.gz) = f1589f5e250fd9e47c03d7548226e0442f425f1c87dcca3484ccb219bd8db2a6
 SIZE (alliance-5.0-20090901.tar.gz) = 8056116
diff --git a/cad/alliance/files/srcdirs.list b/cad/alliance/files/srcdirs.list
deleted file mode 100644
index be8839641462..000000000000
--- a/cad/alliance/files/srcdirs.list
+++ /dev/null
@@ -1,86 +0,0 @@
-abe/src
-abl/src
-abt/src
-abv/src
-alcban/src
-asimut/src
-attila/src
-aut/src
-b2f/src
-bdd/src
-beh/src
-bhl/src
-boog/src
-boom/src
-btr/src
-bvl/src
-cells/src
-ctl/src
-ctp/src
-dreal/src
-druc/src
-elp/src
-exp/src
-fks/src
-flatbeh/src
-flatlo/src
-flatph/src
-fmi/src
-fsm/src
-fsp/src
-ftl/src
-fvh/src
-genlib/src
-genpat/src
-graal/src
-k2f/src
-l2p/src
-log/src
-loon/src
-lvx/src
-lynx/src
-m2e/src
-mbk/src
-mbkal/src
-mbkap/src
-mbkedif/src
-mbkhilo/src
-mbkmg/src
-mbkspice/src
-mbkvhdl/src
-mbkvhdlg/src
-mbkvrlog/src
-mbkvti/src
-mips_asm/src
-mocha/src
-nero/src
-ocp/src
-pat/src
-pat2spi/src
-phl/src
-ppt/src
-proof/src
-rds/src
-rdscif/src
-rdsgds/src
-ring/src
-rtd/src
-rtn/src
-s2r/src
-scapin/src
-scl/src
-sea/src
-syf/src
-vasy/src
-vbh/src
-vbl/src
-vex/src
-vpd/src
-vpn/src
-vtl/src
-vvh/src
-x2y/src
-xfsm/src
-xpat/src
-xsch/src
-xvpn/src