Date: Wed, 22 Jan 2014 21:54:50 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340736 - in head/devel/sdl12: . files Message-ID: <201401222154.s0MLsoTv082486@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Wed Jan 22 21:54:49 2014 New Revision: 340736 URL: http://svnweb.freebsd.org/changeset/ports/340736 QAT: https://qat.redports.org/buildarchive/r340736/ Log: - Enable stagedir support - Add LICENSE - Simplify OPTION handling - Convert USE_GMAKE=yes -> USES=gmake Added: head/devel/sdl12/files/patch-Makefile.in (contents, props changed) Deleted: head/devel/sdl12/files/man3 Modified: head/devel/sdl12/Makefile head/devel/sdl12/pkg-plist Modified: head/devel/sdl12/Makefile ============================================================================== --- head/devel/sdl12/Makefile Wed Jan 22 21:50:58 2014 (r340735) +++ head/devel/sdl12/Makefile Wed Jan 22 21:54:49 2014 (r340736) @@ -12,22 +12,22 @@ DISTNAME= SDL-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= Cross-platform multimedia development API +LICENSE= LGPL21 + BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GMAKE= yes GNU_CONFIGURE= yes WANT_GNOME= yes -USES= pathfix pkgconfig iconv +USES= pathfix pkgconfig iconv gmake CONFIGURE_ENV= ac_cv_header_libusbhid_h=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=--disable-alsa --disable-alsatest -CONFIGURE_ARGS+=--disable-arts -CONFIGURE_ARGS+=--disable-video-directfb +CONFIGURE_ARGS+=--disable-alsa --disable-alsatest \ + --disable-arts --disable-video-directfb EXAMPLES= test/*.c test/*.bmp test/*.dat test/*.xbm test/*.wav DOCS= BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html @@ -42,90 +42,41 @@ VGL_DESC= Video Graphics Lib support OPTIONS_DEFAULT+= VGL .endif -NO_STAGE= yes -.include <bsd.port.pre.mk> - -MAN3!= ${CAT} ${FILESDIR}/man3 - -.if ${PORT_OPTIONS:MAALIB} -CONFIGURE_ARGS+= --enable-video-aalib -LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib -.else -CONFIGURE_ARGS+= --disable-video-aalib -.endif - -.if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -CONFIGURE_ARGS+= --enable-esd -.else -CONFIGURE_ARGS+= --disable-esd --disable-esdtest -.endif - -.if ${PORT_OPTIONS:MGGI} -LIB_DEPENDS+= ggi:${PORTSDIR}/graphics/libggi -CONFIGURE_ARGS+= --enable-video-ggi -.else -CONFIGURE_ARGS+= --disable-video-ggi -.endif - -.if ${PORT_OPTIONS:MNAS} -LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas -.else -CONFIGURE_ARGS+= --disable-nas -.endif - -.if ${PORT_OPTIONS:MOPENGL} -CONFIGURE_ARGS+= --enable-video-opengl -USE_GL= yes -.else -CONFIGURE_ARGS+= --disable-video-opengl -.endif - -.if ${PORT_OPTIONS:MOSS} -CONFIGURE_ARGS+= --enable-oss -.else -CONFIGURE_ARGS+= --disable-oss -.endif +AALIB_CONFIGURE_ENABLE= video-aalib +AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib +ESOUND_USE= GNOME=esound +ESOUND_CONFIGURE_ENABLE= esd esdtest +GGI_CONFIGURE_ENABLE= video-ggi +GGI_LIB_DEPENDS= libggi.so:${PORTSDIR}/graphics/libggi +NAS_CONFIGURE_ENABLE= nas +NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas +OPENGL_CONFIGURE_ENABLE= video-opengl +OPENGL_USE= GL=yes +OSS_CONFIGURE_ENABLE= oss +PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio +SVGALIB_CONFIGURE_ENABLE= video-svga +SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib +VGL_CONFIGURE_ENABLE= video-vgl +X11_CONFIGURE_ENABLE= video-x11 +X11_USE= XORG= x11 xrender xrandr xextproto -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse-simple:${PORTSDIR}/audio/pulseaudio -.else -CONFIGURE_ARGS+= --disable-pulseaudio -.endif - -.if ${PORT_OPTIONS:MSVGALIB} -LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib -CONFIGURE_ARGS+= --enable-video-svga -.else -CONFIGURE_ARGS+= --disable-video-svga -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MVGL} -CONFIGURE_ARGS+= --enable-video-vgl DISPLAY_MSG= ${CAT} ${PKGMESSAGE} .else -CONFIGURE_ARGS+= --disable-video-vgl PKGMESSAGE= none DISPLAY_MSG= ${DO_NADA} .endif -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xrender xrandr xextproto -.else -CONFIGURE_ARGS+= --disable-video-x11 -.endif - post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} &&\ - ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ &&\ + ${MKDIR} ${STAGEDIR}${DOCSDIR} &&\ + ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ &&\ cd ${WRKSRC} &&\ - ${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*" -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} &&\ - ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/ -.endif + ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/ "! -regex .*/man3.*" + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} &&\ + ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/ @${DISPLAY_MSG} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/devel/sdl12/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sdl12/files/patch-Makefile.in Wed Jan 22 21:54:49 2014 (r340736) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2014-01-22 22:33:52.000000000 +0100 ++++ Makefile.in 2014-01-22 22:34:15.000000000 +0100 +@@ -49,7 +49,7 @@ + LT_CURRENT = @LT_CURRENT@ + LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ +-LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) + Modified: head/devel/sdl12/pkg-plist ============================================================================== --- head/devel/sdl12/pkg-plist Wed Jan 22 21:50:58 2014 (r340735) +++ head/devel/sdl12/pkg-plist Wed Jan 22 21:54:49 2014 (r340736) @@ -39,6 +39,180 @@ lib/libSDL.a lib/libSDLmain.a lib/libSDLmain.la libdata/pkgconfig/sdl.pc +man/man3/SDLKey.3.gz +man/man3/SDL_ActiveEvent.3.gz +man/man3/SDL_AddTimer.3.gz +man/man3/SDL_AudioCVT.3.gz +man/man3/SDL_AudioSpec.3.gz +man/man3/SDL_BlitSurface.3.gz +man/man3/SDL_BuildAudioCVT.3.gz +man/man3/SDL_CD.3.gz +man/man3/SDL_CDClose.3.gz +man/man3/SDL_CDEject.3.gz +man/man3/SDL_CDName.3.gz +man/man3/SDL_CDNumDrives.3.gz +man/man3/SDL_CDOpen.3.gz +man/man3/SDL_CDPause.3.gz +man/man3/SDL_CDPlay.3.gz +man/man3/SDL_CDPlayTracks.3.gz +man/man3/SDL_CDResume.3.gz +man/man3/SDL_CDStatus.3.gz +man/man3/SDL_CDStop.3.gz +man/man3/SDL_CDtrack.3.gz +man/man3/SDL_CloseAudio.3.gz +man/man3/SDL_Color.3.gz +man/man3/SDL_CondBroadcast.3.gz +man/man3/SDL_CondSignal.3.gz +man/man3/SDL_CondWait.3.gz +man/man3/SDL_CondWaitTimeout.3.gz +man/man3/SDL_ConvertAudio.3.gz +man/man3/SDL_ConvertSurface.3.gz +man/man3/SDL_CreateCond.3.gz +man/man3/SDL_CreateCursor.3.gz +man/man3/SDL_CreateMutex.3.gz +man/man3/SDL_CreateRGBSurface.3.gz +man/man3/SDL_CreateRGBSurfaceFrom.3.gz +man/man3/SDL_CreateSemaphore.3.gz +man/man3/SDL_CreateThread.3.gz +man/man3/SDL_CreateYUVOverlay.3.gz +man/man3/SDL_Delay.3.gz +man/man3/SDL_DestroyCond.3.gz +man/man3/SDL_DestroyMutex.3.gz +man/man3/SDL_DestroySemaphore.3.gz +man/man3/SDL_DisplayFormat.3.gz +man/man3/SDL_DisplayFormatAlpha.3.gz +man/man3/SDL_DisplayYUVOverlay.3.gz +man/man3/SDL_EnableKeyRepeat.3.gz +man/man3/SDL_EnableUNICODE.3.gz +man/man3/SDL_Event.3.gz +man/man3/SDL_EventState.3.gz +man/man3/SDL_ExposeEvent.3.gz +man/man3/SDL_FillRect.3.gz +man/man3/SDL_Flip.3.gz +man/man3/SDL_FreeCursor.3.gz +man/man3/SDL_FreeSurface.3.gz +man/man3/SDL_FreeWAV.3.gz +man/man3/SDL_FreeYUVOverlay.3.gz +man/man3/SDL_GL_GetAttribute.3.gz +man/man3/SDL_GL_GetProcAddress.3.gz +man/man3/SDL_GL_LoadLibrary.3.gz +man/man3/SDL_GL_SetAttribute.3.gz +man/man3/SDL_GL_SwapBuffers.3.gz +man/man3/SDL_GLattr.3.gz +man/man3/SDL_GetAppState.3.gz +man/man3/SDL_GetAudioStatus.3.gz +man/man3/SDL_GetClipRect.3.gz +man/man3/SDL_GetCursor.3.gz +man/man3/SDL_GetError.3.gz +man/man3/SDL_GetEventFilter.3.gz +man/man3/SDL_GetGamma.3.gz +man/man3/SDL_GetGammaRamp.3.gz +man/man3/SDL_GetKeyName.3.gz +man/man3/SDL_GetKeyState.3.gz +man/man3/SDL_GetModState.3.gz +man/man3/SDL_GetMouseState.3.gz +man/man3/SDL_GetRGB.3.gz +man/man3/SDL_GetRGBA.3.gz +man/man3/SDL_GetRelativeMouseState.3.gz +man/man3/SDL_GetThreadID.3.gz +man/man3/SDL_GetTicks.3.gz +man/man3/SDL_GetVideoInfo.3.gz +man/man3/SDL_GetVideoSurface.3.gz +man/man3/SDL_Init.3.gz +man/man3/SDL_InitSubSystem.3.gz +man/man3/SDL_JoyAxisEvent.3.gz +man/man3/SDL_JoyBallEvent.3.gz +man/man3/SDL_JoyButtonEvent.3.gz +man/man3/SDL_JoyHatEvent.3.gz +man/man3/SDL_JoystickClose.3.gz +man/man3/SDL_JoystickEventState.3.gz +man/man3/SDL_JoystickGetAxis.3.gz +man/man3/SDL_JoystickGetBall.3.gz +man/man3/SDL_JoystickGetButton.3.gz +man/man3/SDL_JoystickGetHat.3.gz +man/man3/SDL_JoystickIndex.3.gz +man/man3/SDL_JoystickName.3.gz +man/man3/SDL_JoystickNumAxes.3.gz +man/man3/SDL_JoystickNumBalls.3.gz +man/man3/SDL_JoystickNumButtons.3.gz +man/man3/SDL_JoystickNumHats.3.gz +man/man3/SDL_JoystickOpen.3.gz +man/man3/SDL_JoystickOpened.3.gz +man/man3/SDL_JoystickUpdate.3.gz +man/man3/SDL_KeyboardEvent.3.gz +man/man3/SDL_KillThread.3.gz +man/man3/SDL_ListModes.3.gz +man/man3/SDL_LoadBMP.3.gz +man/man3/SDL_LoadWAV.3.gz +man/man3/SDL_LockAudio.3.gz +man/man3/SDL_LockSurface.3.gz +man/man3/SDL_LockYUVOverlay.3.gz +man/man3/SDL_MapRGB.3.gz +man/man3/SDL_MapRGBA.3.gz +man/man3/SDL_MixAudio.3.gz +man/man3/SDL_MouseButtonEvent.3.gz +man/man3/SDL_MouseMotionEvent.3.gz +man/man3/SDL_NumJoysticks.3.gz +man/man3/SDL_OpenAudio.3.gz +man/man3/SDL_Overlay.3.gz +man/man3/SDL_Palette.3.gz +man/man3/SDL_PauseAudio.3.gz +man/man3/SDL_PeepEvents.3.gz +man/man3/SDL_PixelFormat.3.gz +man/man3/SDL_PollEvent.3.gz +man/man3/SDL_PumpEvents.3.gz +man/man3/SDL_PushEvent.3.gz +man/man3/SDL_Quit.3.gz +man/man3/SDL_QuitEvent.3.gz +man/man3/SDL_QuitSubSystem.3.gz +man/man3/SDL_RWFromFile.3.gz +man/man3/SDL_Rect.3.gz +man/man3/SDL_RemoveTimer.3.gz +man/man3/SDL_ResizeEvent.3.gz +man/man3/SDL_SaveBMP.3.gz +man/man3/SDL_SemPost.3.gz +man/man3/SDL_SemTryWait.3.gz +man/man3/SDL_SemValue.3.gz +man/man3/SDL_SemWait.3.gz +man/man3/SDL_SemWaitTimeout.3.gz +man/man3/SDL_SetAlpha.3.gz +man/man3/SDL_SetClipRect.3.gz +man/man3/SDL_SetColorKey.3.gz +man/man3/SDL_SetColors.3.gz +man/man3/SDL_SetCursor.3.gz +man/man3/SDL_SetEventFilter.3.gz +man/man3/SDL_SetGamma.3.gz +man/man3/SDL_SetGammaRamp.3.gz +man/man3/SDL_SetModState.3.gz +man/man3/SDL_SetPalette.3.gz +man/man3/SDL_SetTimer.3.gz +man/man3/SDL_SetVideoMode.3.gz +man/man3/SDL_ShowCursor.3.gz +man/man3/SDL_Surface.3.gz +man/man3/SDL_SysWMEvent.3.gz +man/man3/SDL_ThreadID.3.gz +man/man3/SDL_UnlockAudio.3.gz +man/man3/SDL_UnlockSurface.3.gz +man/man3/SDL_UnlockYUVOverlay.3.gz +man/man3/SDL_UpdateRect.3.gz +man/man3/SDL_UpdateRects.3.gz +man/man3/SDL_UserEvent.3.gz +man/man3/SDL_VideoDriverName.3.gz +man/man3/SDL_VideoInfo.3.gz +man/man3/SDL_VideoModeOK.3.gz +man/man3/SDL_WM_GetCaption.3.gz +man/man3/SDL_WM_GrabInput.3.gz +man/man3/SDL_WM_IconifyWindow.3.gz +man/man3/SDL_WM_SetCaption.3.gz +man/man3/SDL_WM_SetIcon.3.gz +man/man3/SDL_WM_ToggleFullScreen.3.gz +man/man3/SDL_WaitEvent.3.gz +man/man3/SDL_WaitThread.3.gz +man/man3/SDL_WarpMouse.3.gz +man/man3/SDL_WasInit.3.gz +man/man3/SDL_keysym.3.gz +man/man3/SDL_mutexP.3.gz +man/man3/SDL_mutexV.3.gz share/aclocal/sdl.m4 %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/COPYING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401222154.s0MLsoTv082486>