Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d21067b29222dad4bb45bc2d74f65feaabc167ff)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d21067b29222dad4bb45bc2d74f65feaabc167ff)
  • Date: Sun, 5 Nov 2006 15:34:15 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics/netpbm/BUILD | 31 +++++++++++++++++++++++++++----
graphics/netpbm/DEPENDS | 4 ++--
graphics/netpbm/HISTORY | 3 +++
3 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 975d521eb67e11832d00fed542596bbaee1d10e2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

x11 and svgalib optional in netpbm

diff --git a/graphics/netpbm/BUILD b/graphics/netpbm/BUILD
index 9e057e6..e8361ba 100755
--- a/graphics/netpbm/BUILD
+++ b/graphics/netpbm/BUILD
@@ -8,12 +8,35 @@ # I have no idea how netpbm gets its sta
# of cflags, the entries in Makefile.config.in are all
# commented out!
sedit "s/^\(CFLAGS =\)/\1 ${CFLAGS} /" Makefile.config &&
+if list_find "$OPTS" no-x11
+then
+ message "disabling X11 stuff" &&
+ sedit 's/^\(X11LIB =\).*$/\1 NONE/' \
+ Makefile.config &&
+ sedit 's/^\(X11HDR_DIR =\).*$/\1/' \
+ Makefile.config
+fi &&
+if list_find "$OPTS" no-svga
+then
+ message "disabling svgalib stuff" &&
+ sedit 's/^\(LINUXSVGALIB =\).*$/\1 NONE/' \
+ Makefile.config &&
+ sedit 's/^\(LINUXSVGAHDR_DIR =\).*$/\1/' \
+ Makefile.config
+fi &&
make_single &&
-if [[ "$(get_spell_provider $SPELL X11-LIBS)" != "xorg-server" ]]; then
- make X11LIB=/usr/X11R6/lib/libX11.so
+
+if list_find "$OPTS" yes-x11
+then
+ if [[ "$(get_spell_provider $SPELL X11-LIBS)" != "xorg-server" ]]; then
+ make X11LIB=/usr/X11R6/lib/libX11.so
+ else
+ make X11LIB=/usr/lib/libX11.so
+ fi
else
- make X11LIB=/usr/lib/libX11.so
-fi &&
+ make
+fi &&
+
if [ -e /tmp/netpbm ]; then
rm -rf /tmp/netpbm
fi &&
diff --git a/graphics/netpbm/DEPENDS b/graphics/netpbm/DEPENDS
index 0060759..3d4b4b4 100755
--- a/graphics/netpbm/DEPENDS
+++ b/graphics/netpbm/DEPENDS
@@ -1,7 +1,7 @@
depends perl &&
depends libpng &&
depends jpeg &&
-depends svgalib &&
-depends X11-LIBS &&
+optional_depends svgalib yes-svga no-svga "svgalib support" &&
+optional_depends X11-LIBS yes-x11 no-x11 "x11 support" &&
depends libxml2 &&
depends tiff
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index 5e48949..ee796b1 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,6 @@
+2006-11-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, BUILD: make x11 and svgalib optional
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d21067b29222dad4bb45bc2d74f65feaabc167ff), Thomas Orgis, 11/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page