aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Samorodov <bsam@FreeBSD.org>2009-06-12 18:03:43 +0000
committerBoris Samorodov <bsam@FreeBSD.org>2009-06-12 18:03:43 +0000
commite6515dfcd25e9a24e4a96edf815836da72b42fe0 (patch)
tree997cf6639db0363f308094941fc40dcd37b66c12
parent76c9db883b81a1943ff857260ab7143d1286ef74 (diff)
Fedora Core 4 didn't have a dependency on libpng12, libjpeg
and libtiff for graphics/linux-sdl_image. New Fedora distros has. So fix it: . graphics/linux-f8-sdl_image and bump PORTREVISION; [1] . graphics/linux-f10-sdl_image and bump PORTREVISION; . Mk/bsd.linux-apps.mk. PR: ports/135339 [1] Submitted by: amdmi [1]
Notes
Notes: svn path=/head/; revision=235657
-rw-r--r--Mk/bsd.linux-apps.mk4
-rw-r--r--graphics/linux-f10-sdl_image/Makefile3
-rw-r--r--graphics/linux-f8-sdl_image/Makefile4
3 files changed, 8 insertions, 3 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
index b7acd0195b95..43f52d724dde 100644
--- a/Mk/bsd.linux-apps.mk
+++ b/Mk/bsd.linux-apps.mk
@@ -374,7 +374,11 @@ sdlimage_f8_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
sdlimage_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
sdlimage_DETECT= ${sdlimage${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
sdlimage_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_image
+. if ${LINUX_DIST_SUFFIX} == ""
sdlimage_DEPENDS= sdl12
+. else
+sdlimage_DEPENDS= jpeg png sdl12 tiff
+. endif
sdlmixer_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.4
sdlmixer_f8_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile
index 89523abf3e8a..9e8a584b5b3d 100644
--- a/graphics/linux-f10-sdl_image/Makefile
+++ b/graphics/linux-f10-sdl_image/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl_image
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f10-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -18,7 +19,7 @@ CONFLICTS= linux-sdl_image-[0-9]* linux-f8-sdl_image-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
-USE_LINUX_APPS= sdl12
+USE_LINUX_APPS= jpeg png sdl12 tiff
LINUX_NAME= SDL_image
LINUX_DIST_VER= 10
RPMVERSION= 6.fc9
diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile
index 402c534d3de6..8840d274fc4c 100644
--- a/graphics/linux-f8-sdl_image/Makefile
+++ b/graphics/linux-f8-sdl_image/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl_image
PORTVERSION= 1.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -19,7 +19,7 @@ CONFLICTS= linux-sdl_image-[0-9]* linux-f10-sdl_image-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
-USE_LINUX_APPS= sdl12
+USE_LINUX_APPS= jpeg png sdl12 tiff
LINUX_NAME= SDL_image
LINUX_DIST_VER= 8
RPMVERSION= 5.fc8