diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2011-03-07 23:26:51 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2011-03-07 23:26:51 +0000 |
| commit | 37f6fa11056250efd44cd3787e6a782101677cc4 (patch) | |
| tree | 5ef09649e4f51eef3043dc447f8ed4cdcfdfc633 /x11-toolkits/irrlicht | |
| parent | - Fix build: CPPFLAGS are now part of default MAKE_ENV (trivial fix) (diff) | |
- Install a valid shlib version. No ugly BUILD_DEPENDS entry anymore
- Bump PORTREVISION
PR: 154111
Submitted by: Pascal Stumpf <Pascal.Stumpf __ __ cubes.de>
Notes
Notes:
svn path=/head/; revision=270478
Diffstat (limited to 'x11-toolkits/irrlicht')
| -rw-r--r-- | x11-toolkits/irrlicht/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 9aa2cbccaf4f..4ca64732c2fe 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -7,6 +7,7 @@ PORTNAME= irrlicht PORTVERSION= 1.7.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION} @@ -21,12 +22,13 @@ USE_DOS2UNIX= Makefile *.cpp *.h *.txt USE_GMAKE= yes USE_GL= yes USE_LDCONFIG= yes +MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER} PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER} SUB_FILES= pkg-message BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht -SHARED_LIB_VER= ${PORTVERSION} +SHARED_LIB_VER= 1 EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \ 06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \ 11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \ diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index 1522a900474d..4de044fa2506 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -1,5 +1,5 @@ ---- source/Irrlicht/Makefile 2010-12-13 14:40:13.000000000 -0500 -+++ source/Irrlicht/Makefile 2010-12-13 14:46:13.000000000 -0500 +--- source/Irrlicht/Makefile 2011-03-07 18:03:16.000000000 -0500 ++++ source/Irrlicht/Makefile 2011-03-07 18:10:51.000000000 -0500 @@ -3,7 +3,7 @@ VERSION_RELEASE = 2 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -72,7 +72,7 @@ #OSX specific options staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX -@@ -103,12 +102,12 @@ +@@ -103,20 +102,20 @@ staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ #################### @@ -85,11 +85,12 @@ +# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/FreeBSD sharedlib: $(LINKOBJ) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(SHLIB_VER) -o $(SHARED_LIB).$(SHLIB_VER) $^ $(LDFLAGS) mkdir -p $(LIB_PATH) - cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) +- cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) ++ cp $(SHARED_LIB).$(SHLIB_VER) $(LIB_PATH) -@@ -116,7 +115,7 @@ + # Builds Irrlicht as static lib (libIrrlicht.a) $(STATIC_LIB): $(LINKOBJ) $(AR) rs $@ $^ |