diff options
35 files changed, 71 insertions, 71 deletions
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile index 2e93a773baf..0ace630a4de 100644 --- a/audio/cheesetracker/Makefile +++ b/audio/cheesetracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/05/02 11:53:38 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2003/06/02 14:05:00 abs Exp $ # DISTNAME= cheesetracker-0.5.5 @@ -26,8 +26,8 @@ pre-configure: cd ${WRKSRC} && ${AUTOMAKE} --add-missing .include "../../mk/automake.mk" -.include "../../lang/gcc/buildlink2.mk" -.include "../../x11/gtk--/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" +.include "../../x11/gtk--/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index 90ee9fadf73..6088a945245 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/10/02 08:41:22 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2003/06/02 14:05:01 abs Exp $ DISTNAME= libogg-1.0 PKGNAME= libogg-1.0.0.8 @@ -16,5 +16,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SUBST+= DISTNAME=${DISTNAME} -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index f526b5f1ad4..0a3b2bb20f5 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/10/02 19:45:55 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2003/06/02 14:05:01 abs Exp $ DISTNAME= libvorbis-1.0 PKGNAME= libvorbis-1.0.0.8 @@ -17,5 +17,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SUBST+= DISTNAME=${DISTNAME} .include "../../audio/libogg/buildlink2.mk" -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 4426b86e8ab..716fa88c27f 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/06/02 01:21:29 jschauma Exp $ +# $NetBSD: Makefile,v 1.10 2003/06/02 14:05:02 abs Exp $ DISTNAME= RasMol_2.7.1 PKGNAME= rasmol-2.7.1 @@ -19,7 +19,7 @@ MAKE_ENV+= DEPTHDEF="${DEPTHDEF}" .include "../../mk/bsd.prefs.mk" .if (${MACHINE_ARCH} == arm32) -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .if defined(RASMOL_DEPTH) diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile index 5ad5c64fdf2..2129336666f 100644 --- a/cad/fastcap/Makefile +++ b/cad/fastcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/09/29 05:11:01 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2003/06/02 14:05:02 abs Exp $ # DISTNAME= fastcap-2.0-15Jul92 @@ -25,7 +25,7 @@ CONFIGURE_SCRIPT= ./config CONFIGURE_ARGS= 4 .if (${MACHINE_ARCH} == arm32) -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif do-install: diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile index 0423f39f580..6b2b96e5bd5 100644 --- a/cad/fasthenry/Makefile +++ b/cad/fasthenry/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/03/14 19:37:31 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2003/06/02 14:05:02 abs Exp $ # DISTNAME= fasthenry-3.0-12Nov96 @@ -40,7 +40,7 @@ MAKE_ENV+= LIBS="${LIBS}" .endif .if (${MACHINE_ARCH} == "arm32") -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index 652c4a098ae..fdcd69c0537 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/05/02 11:54:01 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2003/06/02 14:05:02 abs Exp $ DISTNAME= gabber-0.8.7 PKGREVISION= 8 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-xmms --disable-sigctest .include "../../devel/gal/buildlink2.mk" .include "../../devel/libglade/buildlink2.mk" .include "../../devel/libsigc++10/buildlink2.mk" -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../graphics/freetype-lib/buildlink2.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk--/buildlink2.mk" diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile index 9147cffec6e..52f748c75e0 100644 --- a/cross/h8300-hms-gcc/Makefile +++ b/cross/h8300-hms-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2003/06/02 14:05:02 abs Exp $ DISTNAME= gcc-core-3.1 PKGNAME= cross-h8300-hms-gcc-3.1 @@ -42,5 +42,5 @@ post-install: ${LN} -s ${H8300_PREFIX}/bin/$$f ${PREFIX}/bin/$$f ; \ done -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile index 63e625d264c..0e4016730da 100644 --- a/devel/prc-tools/Makefile +++ b/devel/prc-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/05/05 22:17:58 seb Exp $ +# $NetBSD: Makefile,v 1.8 2003/06/02 14:05:03 abs Exp $ # DISTNAME= prc-tools-2.2 @@ -58,7 +58,7 @@ pre-patch: && ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff .include "../../mk/autoconf.mk" -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 7e119caa2b8..a538614b1c4 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/05/16 18:11:35 magick Exp $ +# $NetBSD: Makefile,v 1.23 2003/06/02 14:05:03 abs Exp $ DISTNAME= xemacs-21.5.13 CATEGORIES= editors @@ -15,7 +15,7 @@ PLIST_SUBST+= EMACSVER=xemacs-21.5-b13 MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b13 .if (${MACHINE_ARCH} == "arm32") -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../mk/bsd.prefs.mk" diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile index c6771d38c31..2559365d1d6 100644 --- a/games/angband-tty/Makefile +++ b/games/angband-tty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/04/10 20:10:16 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/06/02 14:05:03 abs Exp $ # DISTNAME= angband-283 @@ -23,7 +23,7 @@ ALL_TARGET= angband SPOILERFILE= angband-spoilers.tar.gz .if (${MACHINE_ARCH} == arm32) -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif do-install: diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index a419560be37..80ded1c6e89 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:17 grant Exp $ +# $NetBSD: Makefile,v 1.20 2003/06/02 14:05:03 abs Exp $ # DISTNAME= angband-3.0.1 @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-setgid=games --prefix=${PREFIX} .if ${MACHINE_ARCH} == "arm32" -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif # add spoiler files and clean up a bit diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index f934e84a736..8cf57aeb5f6 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2003/04/16 13:27:21 mjl Exp $ +# $NetBSD: Makefile,v 1.97 2003/06/02 14:05:04 abs Exp $ .include "./Makefile.common" @@ -29,7 +29,7 @@ PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER} NOT_FOR_PLATFORM= NetBSD-*-sparc64 # NetBSD 1.5's gcc is too old to compile this pkg -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" GCC_REQD= 2.95.3 # Avoid compiler bug on "mipsel" (cobalt?) diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common index be2434597d9..432c0e15f02 100644 --- a/graphics/aalib/Makefile.common +++ b/graphics/aalib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2003/03/29 12:41:13 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.4 2003/06/02 14:05:04 abs Exp $ DISTNAME= aalib-${DIST_VERS} WRKSRC= ${WRKDIR}/aalib-1.4.0 @@ -19,7 +19,7 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .if (${MACHINE_ARCH} == arm32) -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../mk/texinfo.mk" diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 5655e1c4318..adb69386b4d 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/06/02 01:19:32 jschauma Exp $ +# $NetBSD: Makefile,v 1.5 2003/06/02 14:05:04 abs Exp $ # DISTNAME= aqsis-0.6.4 @@ -18,7 +18,7 @@ USE_X11= yes USE_BUILDLINK2= yes -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../devel/libargparse/buildlink2.mk" .include "../../graphics/Mesa/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends index 5a24ce3b821..e7d28643b96 100644 --- a/graphics/mplayer-share/Makefile.depends +++ b/graphics/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.12 2003/05/24 17:27:10 salo Exp $ +# $NetBSD: Makefile.depends,v 1.13 2003/06/02 14:05:04 abs Exp $ DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share @@ -25,8 +25,8 @@ USE_X11= # defined .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" -.include "../../lang/gcc/buildlink2.mk" .include "../../misc/libdvdread/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .if defined(USE_OSS) . include "../../mk/ossaudio.buildlink2.mk" diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile index fa20628a8cc..3c7a0f2f963 100644 --- a/graphics/ncview/Makefile +++ b/graphics/ncview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/06/02 01:19:20 jschauma Exp $ +# $NetBSD: Makefile,v 1.10 2003/06/02 14:05:05 abs Exp $ DISTNAME= ncview-1.92c CATEGORIES= graphics @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --with-udunits_incdir=${BUILDLINK_PREFIX.udunits}/include CONFIGURE_ARGS+= --with-udunits_libdir=${BUILDLINK_PREFIX.udunits}/lib .if (${MACHINE_ARCH} == "arm32") -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../devel/netcdf/buildlink2.mk" diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index 68221186e50..b79dfb0421d 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/06/02 01:19:19 jschauma Exp $ +# $NetBSD: Makefile,v 1.21 2003/06/02 14:05:05 abs Exp $ DISTNAME= ogle-0.9.1 PKGREVISION= 1 @@ -30,7 +30,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include "../../devel/binutils/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" -.include "../../lang/gcc/buildlink2.mk" .include "../../misc/libdvdread/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile index b10a2b8e806..060b7735e47 100644 --- a/graphics/ogle_gui/Makefile +++ b/graphics/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/06/02 01:19:19 jschauma Exp $ +# $NetBSD: Makefile,v 1.16 2003/06/02 14:05:05 abs Exp $ DISTNAME= ogle_gui-0.9.1 PKGREVISION= 1 @@ -25,7 +25,7 @@ LDFLAGS+= ${BUILDLINK_LDFLAGS.ogle} .include "../../devel/binutils/buildlink2.mk" .include "../../devel/libglade/buildlink2.mk" .include "../../graphics/ogle/buildlink2.mk" -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile index bce2952fe83..0380ea883e3 100644 --- a/lang/gpc/Makefile +++ b/lang/gpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/06/02 01:19:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2003/06/02 14:05:06 abs Exp $ DISTNAME= gpc-2.1 PKGREVISION= 1 @@ -73,7 +73,7 @@ pre-configure: ${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/gcc/c-gperf.h ${ECHO} "bogus" > ${WRKSRC}/gcc/cstamp-h.in -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index f3469f63d46..3c3fa21df6b 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/05/27 21:57:26 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2003/06/02 14:05:06 abs Exp $ .include "Makefile.common" @@ -205,6 +205,6 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk .if ${MACHINE_ARCH} == "alpha" -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 92bba3da22d..2fe5feb5bc7 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2003/05/06 17:41:55 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2003/06/02 14:05:06 abs Exp $ # DISTNAME= ${SCIBASE}.src @@ -63,7 +63,7 @@ post-install: ${RM} -f ${PREFIX}/lib/${PKGNAME}/macros/util/scipad.sci.orig .if ${MACHINE_ARCH} == "arm32" -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .endif # the "SCI=0 && unset SCI" is done because some of the tests really will diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 710d54fa777..5b022a4754e 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/06/02 01:18:13 jschauma Exp $ +# $NetBSD: Makefile,v 1.22 2003/06/02 14:05:06 abs Exp $ DISTNAME= koffice-1.2.1 PKGREVISION= 2 @@ -38,12 +38,12 @@ post-install: @# their local directories. ${CHMOD} u+w ${PREFIX}/share/kde/templates/.source/* -.include "../../lang/gcc/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../textproc/libxslt/buildlink2.mk" .include "../../graphics/libart2/buildlink2.mk" .include "../../x11/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/koffice/buildlink2.mk b/misc/koffice/buildlink2.mk index 40281326ab9..d77e9b667c7 100644 --- a/misc/koffice/buildlink2.mk +++ b/misc/koffice/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:55 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/06/02 14:05:07 abs Exp $ # # This Makefile fragment is included by packages that use koffice. # @@ -170,7 +170,7 @@ BUILDLINK_FILES.koffice+= lib/libkwmf.* BUILDLINK_FILES.koffice+= lib/libkwordexportfilters.* BUILDLINK_FILES.koffice+= lib/straight_connector.ksp -.include "../../lang/gcc/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../textproc/libxslt/buildlink2.mk" .include "../../graphics/libart2/buildlink2.mk" diff --git a/news/inn/Makefile b/news/inn/Makefile index e0684e957dc..96ea44db2b8 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2003/05/13 11:56:44 tron Exp $ +# $NetBSD: Makefile,v 1.43 2003/06/02 14:05:07 abs Exp $ DISTNAME= inn-${INN_VERSION} CATEGORIES= news @@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail .endif .if (${MACHINE_ARCH} == arm32) -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif post-patch: diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index a0e1c11b10f..89e1e405656 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2003/03/29 12:42:15 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.45 2003/06/02 14:05:07 abs Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -135,7 +135,7 @@ ALL_TARGET= std .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .if defined(ZOULARISBASE) LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index e4fd7de9243..d15b62e1da4 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/01/25 09:37:38 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2003/06/02 14:05:07 abs Exp $ DISTNAME= hpijs-1.3 CATEGORIES= print @@ -17,7 +17,7 @@ CPPFLAGS+= -DAPDK_BUFFER_SEND .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" diff --git a/security/sfs/Makefile b/security/sfs/Makefile index f3d107a6579..8495dfda5f9 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/03/25 15:51:50 grant Exp $ +# $NetBSD: Makefile,v 1.5 2003/06/02 14:05:08 abs Exp $ # DISTNAME= sfs-0.7.2 @@ -49,8 +49,8 @@ post-install: > ${SFSEXAMPLEDIR}/sfsrwsd_config.sample .include "../../devel/gmp/buildlink2.mk" -.include "../../lang/gcc/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" +.include "../../mk/gcc.buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index a73a36bf286..503330b36bc 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2003/05/29 23:14:11 grant Exp $ +# $NetBSD: Makefile,v 1.51 2003/06/02 14:05:08 abs Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 5 @@ -101,7 +101,7 @@ post-install: # XXX See below for NetBSD/alpha issues. .if (${MACHINE_ARCH} == "alpha") -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../archivers/bzip2/buildlink2.mk" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index f30af219f48..0a5bd9c1dcb 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2003/05/29 23:14:12 grant Exp $ +# $NetBSD: Makefile,v 1.30 2003/06/02 14:05:08 abs Exp $ DISTNAME= kdelibs-3.1.2 CATEGORIES= x11 @@ -107,7 +107,7 @@ post-install: ) > ${PLIST_SRC} .if ${MACHINE_ARCH} == "alpha" -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../archivers/bzip2/buildlink2.mk" .include "../../audio/arts/buildlink2.mk" diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index 9dae15716cf..f89b0d601ed 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/06/02 01:15:40 jschauma Exp $ +# $NetBSD: Makefile,v 1.8 2003/06/02 14:05:08 abs Exp $ DISTNAME= neXtaw-0.14.0 CATEGORIES= x11 @@ -21,7 +21,7 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-alpha) -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif post-install: diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile index c8ff0d96bc5..62101bf66a7 100644 --- a/x11/xephem/Makefile +++ b/x11/xephem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/06/02 01:15:35 jschauma Exp $ +# $NetBSD: Makefile,v 1.18 2003/06/02 14:05:09 abs Exp $ DISTNAME= xephem-3.5.2 PKGREVISION= 1 @@ -24,7 +24,7 @@ BUILD_DIRS= ${LIBSRC1} ${LIBSRC2} ${WRKSRC} INSTALL_DIRS= ${WRKSRC} .if (${MACHINE_ARCH} == "arm32") -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif post-install: diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 049ef751cfa..9882f51b25a 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/05/05 14:42:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.34 2003/06/02 14:05:09 abs Exp $ DISTNAME= xfce-3.8.18 PKGREVISION= 1 @@ -22,7 +22,7 @@ USE_GMAKE= # defined GNU_CONFIGURE= # defined .if ${MACHINE_ARCH} == "alpha" -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif CONFIGURE_ARGS+= --without-included-gettext diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile index 7efc0797341..873d4d44c16 100644 --- a/x11/xphoon/Makefile +++ b/x11/xphoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/03/29 12:43:14 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2003/06/02 14:05:09 abs Exp $ # DISTNAME= xphoon.tar @@ -22,7 +22,7 @@ MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS} .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == arm32 -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .if ${OPSYS} == "NetBSD" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 09fc5027236..87225b1a31d 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.47 2003/05/23 09:39:52 wiz Exp $ +# $NetBSD: Makefile.common,v 1.48 2003/06/02 14:05:09 abs Exp $ # DISTNAME= xscreensaver-4.10 @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --without-kerberos .endif .if (${MACHINE_ARCH} == "arm32") -. include "../../lang/gcc/buildlink2.mk" +. include "../../mk/gcc.buildlink2.mk" .endif .include "../../graphics/gle/buildlink2.mk" |