diff options
| -rw-r--r-- | audio/SDL_mixer/Makefile | 18 | ||||
| -rw-r--r-- | devel/SDL/Makefile | 4 | ||||
| -rw-r--r-- | devel/SDL/Makefile.common | 14 | ||||
| -rw-r--r-- | devel/smpeg/Makefile | 12 | ||||
| -rw-r--r-- | graphics/SDL_image/Makefile | 16 |
5 files changed, 38 insertions, 26 deletions
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index f31c8c90204..42fde400c67 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/05 22:44:04 jlam Exp $ # DISTNAME= SDL_mixer-1.2.5 @@ -12,7 +12,9 @@ COMMENT= Multi-channel audio mixer library CONFLICTS= SDL-mixer-[0-9]* -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_X11= YES USE_LIBTOOL= YES @@ -22,12 +24,14 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CPPFLAGS= -Dunix=1 CFLAGS= -DPREFIX=\"\\\"${PREFIX}\\\"\" +INSTALLATION_DIRS= bin + post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/.libs/playmus ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/.libs/playwave ${PREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playmus ${PREFIX}/bin + ${PKGLIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin -.include "../../audio/libogg/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/smpeg/buildlink2.mk" +.include "../../audio/libogg/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/smpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 132fc9bc268..875736bc468 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2003/09/03 19:30:49 drochner Exp $ +# $NetBSD: Makefile,v 1.53 2004/01/05 22:44:04 jlam Exp $ # +PKG_INSTALLATION_TYPES= overwrite pkgviews + .include "Makefile.common" LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common index 6b046e26f16..dc2eddf76a6 100644 --- a/devel/SDL/Makefile.common +++ b/devel/SDL/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2003/10/29 20:54:58 heinz Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/01/05 22:44:04 jlam Exp $ # DISTNAME= SDL-1.2.6 @@ -12,7 +12,7 @@ COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library DISTINFO_FILE= ${.CURDIR}/../../devel/SDL/distinfo PATCHDIR= ${.CURDIR}/../../devel/SDL/patches -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11= YES GNU_CONFIGURE= YES USE_GMAKE= YES @@ -44,16 +44,16 @@ MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" # CONFIGURE_ENV+= SYSTEM_LIBS="${LDFLAGS}" -.include "../../mk/ossaudio.buildlink2.mk" +.include "../../mk/ossaudio.buildlink3.mk" .if defined(HAVE_OSS) && (${HAVE_OSS} == "YES") AM_CFLAGS= -D_PATH_DEV_DSP=\\\"${DEVOSSAUDIO}\\\" MAKE_ENV+= AM_CFLAGS="${AM_CFLAGS}" .endif -.include "../../graphics/MesaLib/buildlink2.mk" -.include "../../graphics/glut/buildlink2.mk" -.include "../../graphics/aalib-x11/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glut/buildlink3.mk" +.include "../../graphics/aalib-x11/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") # Let SDL know that we do not have native pthreads and are using GNU pth. diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile index 1f967738db1..9cc748dbe67 100644 --- a/devel/smpeg/Makefile +++ b/devel/smpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/11/30 22:58:41 jschauma Exp $ +# $NetBSD: Makefile,v 1.21 2004/01/05 22:44:04 jlam Exp $ # DISTNAME= smpeg-0.4.4 @@ -11,7 +11,9 @@ MAINTAINER= wulf@NetBSD.org HOMEPAGE= http://www.lokigames.com/development/smpeg.php3 COMMENT= SDL MPEG Player Library -USE_BUILDLINK2= yes +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_X11= yes @@ -21,8 +23,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CPPFLAGS+= -Dunix=1 -.include "../../devel/SDL/buildlink2.mk" -.include "../../graphics/glu/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" +.include "../../devel/SDL/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile index 1fd36fb52bc..7df7a031005 100644 --- a/graphics/SDL_image/Makefile +++ b/graphics/SDL_image/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/03 18:49:41 reed Exp $ +# $NetBSD: Makefile,v 1.13 2004/01/05 22:44:04 jlam Exp $ # DISTNAME= SDL_image-1.2.3 @@ -12,20 +12,24 @@ COMMENT= Load images as SDL surfaces CONFLICTS= SDL-image-[0-9]* -USE_BUILDLINK2= YES +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= YES USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --enable-tif +INSTALLATION_DIRS= bin + post-install: ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/showimage \ ${PREFIX}/bin -.include "../../graphics/jpeg/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../graphics/tiff/buildlink2.mk" -.include "../../devel/SDL/buildlink2.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |