Mon Dec 15 09:05:32 2014 UTC ()
Remove needless CONFIGURE_ARGS and LDFLAGS settings.


(obache)
diff -r1.42 -r1.43 pkgsrc/cad/xcircuit/Makefile
cvs diff -r1.42 -r1.43 pkgsrc/cad/xcircuit/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/Makefile 2014/12/15 08:58:52 1.42
+++ pkgsrc/cad/xcircuit/Makefile 2014/12/15 09:05:32 1.43
@@ -1,44 +1,40 @@ @@ -1,44 +1,40 @@
1# $NetBSD: Makefile,v 1.42 2014/12/15 08:58:52 obache Exp $ 1# $NetBSD: Makefile,v 1.43 2014/12/15 09:05:32 obache Exp $
2 2
3DISTNAME= xcircuit-3.7.50 3DISTNAME= xcircuit-3.7.50
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= cad graphics 5CATEGORIES= cad graphics
6MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ 6MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= shaun@inerd.com 9MAINTAINER= shaun@inerd.com
10HOMEPAGE= http://opencircuitdesign.com/xcircuit/ 10HOMEPAGE= http://opencircuitdesign.com/xcircuit/
11COMMENT= Drawing program for X11 (especially for circuits) 11COMMENT= Drawing program for X11 (especially for circuits)
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME} 14WRKSRC= ${WRKDIR}/${DISTNAME}
15USE_TOOLS+= gmake gs:run 15USE_TOOLS+= gmake gs:run
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18.include "../../lang/tcl/Makefile.version" 18.include "../../lang/tcl/Makefile.version"
19.include "../../x11/tk/Makefile.version" 19.include "../../x11/tk/Makefile.version"
20 20
21CONFIGURE_ARGS+=--prefix=${PREFIX} 
22CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib 21CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
23CONFIGURE_ARGS+=--with-tk=${BUILDLINK_PREFIX.tk}/lib 22CONFIGURE_ARGS+=--with-tk=${BUILDLINK_PREFIX.tk}/lib
24CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include 23CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include
25CONFIGURE_ARGS+=--with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib 24CONFIGURE_ARGS+=--with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib
26CONFIGURE_ARGS+=--with-tkincls=${BUILDLINK_PREFIX.tk}/include 25CONFIGURE_ARGS+=--with-tkincls=${BUILDLINK_PREFIX.tk}/include
27CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib 26CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib
28#CFLAGS+= -DBUILTINS_DIR=${PREFIX}/lib/${DISTNAME:C/\.[^\.]*$//} 27#CFLAGS+= -DBUILTINS_DIR=${PREFIX}/lib/${DISTNAME:C/\.[^\.]*$//}
29LDFLAGS+= -ltcl${TCL_VERSION:C/\.[^\.]*$//:C/\.//g} 
30LDFLAGS+= -ltk${TK_VERSION:C/\.[^\.]*$//:C/\.//g} 
31LDFLAGS+= -L${LOCALBASE}/lib 
32 28
33BUILD_TARGET= tcl 29BUILD_TARGET= tcl
34INSTALL_TARGET= install-tcl 30INSTALL_TARGET= install-tcl
35INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/examples/xcircuit 31INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/examples/xcircuit
36 32
37post-extract: 33post-extract:
38 ${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc 34 ${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc
39 ${TOUCH} ${WRKSRC}/menudep.h 35 ${TOUCH} ${WRKSRC}/menudep.h
40 36
41post-install: 37post-install:
42 ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/share/examples/xcircuit/ 38 ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/share/examples/xcircuit/
43 ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/share/examples/xcircuit/ 39 ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/share/examples/xcircuit/
44 40