diff options
-rw-r--r-- | cad/spice/Makefile | 5 | ||||
-rw-r--r-- | cad/spice/scripts/configure | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 9fe2f13ee6e1..2ed20c5a8313 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -25,6 +25,7 @@ MAN1= sconvert.1 nutmeg.1 spice.1 MAN3= mfb.3 MAN5= mfbcap.5 MLINKS= spice.1 spice3.1 +MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV+= STRIP_CMD=${STRIP_CMD} .ifdef WITHOUT_X11 @@ -40,7 +41,9 @@ USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/ucb|${LOCALBASE}/bin|' ${WRKSRC}/util/build -post-configure: +do-configure: + @${CP} ${FILESDIR}/FreeBSD ${WRKSRC}/conf/FreeBSD + @${CP} ${FILESDIR}/FreeBSD.without_x11 ${WRKSRC}/conf/FreeBSD.without_x11 @${REINPLACE_CMD} -e 's+@CC@+${CC}+ ; s+@CFLAGS@+${CFLAGS}+ ; \ s+@X11BASE@+${X11BASE}+;' \ ${WRKSRC}/conf/FreeBSD ${WRKSRC}/conf/FreeBSD.without_x11 diff --git a/cad/spice/scripts/configure b/cad/spice/scripts/configure deleted file mode 100644 index 38b148fb916f..000000000000 --- a/cad/spice/scripts/configure +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -rm -f ${WRKSRC}/makefile -cp ${FILESDIR}/Makefile ${WRKSRC}/Makefile -cp ${FILESDIR}/FreeBSD ${WRKSRC}/conf/FreeBSD -cp ${FILESDIR}/FreeBSD.without_x11 ${WRKSRC}/conf/FreeBSD.without_x11 |