diff options
| author | jlam <jlam> | 2002-09-29 09:38:20 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-29 09:38:20 +0000 |
| commit | 05d3bd32dbfc9449f071f69596c0560b74350072 (patch) | |
| tree | bd9f27ec74d5bd34dc3c739b41212eb23e87e0f5 | |
| parent | a17115f0182366769cb1d5580ef6e9fe4453576d (diff) | |
| download | pkgsrc-05d3bd32dbfc9449f071f69596c0560b74350072.tar.gz | |
Use gcc/buildlink2.mk instead of Makefile.gcc
| -rw-r--r-- | print/lyx/Makefile | 10 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 8698c5211cd..a3b46b52231 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2002/09/21 04:52:38 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2002/09/29 09:42:38 jlam Exp $ # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp # @@ -16,14 +16,9 @@ COMMENT= Graphical frontend for LaTeX (nearly WYSIWYG) DEPENDS= ispell-base-[0-9]*:../../textproc/ispell-base DEPENDS+= teTeX>=1.0.6:../../print/teTeX -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) -# "egcs" cannot be used, as this package tickles c++ compiler bugs -.include "../../lang/gcc/Makefile.gcc" -.endif - USE_BUILDLINK2= YES USE_PERL5= YES +USE_CXX= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-extra-lib=${BUILDLINK_PREFIX.xforms}/lib \ --with-extra-inc=${BUILDLINK_PREFIX.xforms}/include/X11 @@ -39,6 +34,7 @@ post-install: .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" +.include "../../lang/gcc/buildlink2.mk" .include "../../x11/xforms/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 58b87f9850f..39b7ef6e710 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2002/09/21 22:47:11 jlam Exp $ +# $NetBSD: Makefile.common,v 1.37 2002/09/29 09:38:20 jlam Exp $ # DISTNAME= xscreensaver-4.02 @@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --without-kerberos .endif .if (${MACHINE_ARCH} == "arm32") -. include "../../lang/gcc/Makefile.gcc" +. include "../../lang/gcc/buildlink2.mk" .endif post-patch: |