aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/librsvg/Makefile5
-rw-r--r--graphics/librsvg/distinfo2
-rw-r--r--graphics/librsvg/files/patch-librsvg-config.in16
-rw-r--r--graphics/librsvg/files/patch-ltmain.sh18
-rw-r--r--graphics/librsvg/pkg-plist29
-rw-r--r--graphics/librsvg2/Makefile5
-rw-r--r--graphics/librsvg2/distinfo2
-rw-r--r--graphics/librsvg2/files/patch-librsvg-config.in16
-rw-r--r--graphics/librsvg2/files/patch-ltmain.sh18
-rw-r--r--graphics/librsvg2/pkg-plist29
10 files changed, 104 insertions, 36 deletions
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 104dfb86888b..d525020390cd 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= librsvg
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/librsvg
@@ -21,9 +21,8 @@ LIB_DEPENDS= freetype.7:${PORTSDIR}/print/freetype2 \
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMELIBS= yes
-USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index badbc776a807..3a0bd772871d 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1 +1 @@
-MD5 (librsvg-1.0.1.tar.gz) = aea434dc24aba3f1952e2a0aade8ed4e
+MD5 (librsvg-1.0.2.tar.gz) = 4bfa03ec2218ee29e8364c80e3c4a3ae
diff --git a/graphics/librsvg/files/patch-librsvg-config.in b/graphics/librsvg/files/patch-librsvg-config.in
new file mode 100644
index 000000000000..84d673894427
--- /dev/null
+++ b/graphics/librsvg/files/patch-librsvg-config.in
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- librsvg-config.in 2001/10/05 14:55:24 1.1
++++ librsvg-config.in 2001/10/05 15:05:57
+@@ -39,9 +39,7 @@
+ echo @LIBRSVG_VERSION@
+ ;;
+ --cflags)
+- if test @includedir@ != /usr/include ; then
+- includes=-I@includedir@
+- fi
++ includes=-I@includedir@/librsvg-1
+ echo $includes
+ ;;
+ --libs)
diff --git a/graphics/librsvg/files/patch-ltmain.sh b/graphics/librsvg/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/graphics/librsvg/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh 2001/08/27 09:51:26 1.1
++++ ltmain.sh 2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/librsvg/pkg-plist b/graphics/librsvg/pkg-plist
index 27700d6246ad..94cde0f2d87c 100644
--- a/graphics/librsvg/pkg-plist
+++ b/graphics/librsvg/pkg-plist
@@ -1,20 +1,21 @@
bin/librsvg-config
etc/librsvgConf.sh
-include/librsvg/art_render.h
-include/librsvg/art_render_gradient.h
-include/librsvg/art_render_mask.h
-include/librsvg/art_render_svp.h
-include/librsvg/art_rgba.h
-include/librsvg/librsvg-features.h
-include/librsvg/rsvg-bpath-util.h
-include/librsvg/rsvg-css.h
-include/librsvg/rsvg-defs.h
-include/librsvg/rsvg-ft.h
-include/librsvg/rsvg-paint-server.h
-include/librsvg/rsvg-path.h
-include/librsvg/rsvg.h
+include/librsvg-1/librsvg/art_render.h
+include/librsvg-1/librsvg/art_render_gradient.h
+include/librsvg-1/librsvg/art_render_mask.h
+include/librsvg-1/librsvg/art_render_svp.h
+include/librsvg-1/librsvg/art_rgba.h
+include/librsvg-1/librsvg/librsvg-features.h
+include/librsvg-1/librsvg/rsvg-bpath-util.h
+include/librsvg-1/librsvg/rsvg-css.h
+include/librsvg-1/librsvg/rsvg-defs.h
+include/librsvg-1/librsvg/rsvg-ft.h
+include/librsvg-1/librsvg/rsvg-paint-server.h
+include/librsvg-1/librsvg/rsvg-path.h
+include/librsvg-1/librsvg/rsvg.h
lib/librsvg.a
lib/librsvg.so
lib/librsvg.so.1
share/aclocal/librsvg.m4
-@dirrm include/librsvg
+@dirrm include/librsvg-1/librsvg
+@dirrm include/librsvg-1
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 104dfb86888b..d525020390cd 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= librsvg
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/librsvg
@@ -21,9 +21,8 @@ LIB_DEPENDS= freetype.7:${PORTSDIR}/print/freetype2 \
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOMELIBS= yes
-USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index badbc776a807..3a0bd772871d 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1 +1 @@
-MD5 (librsvg-1.0.1.tar.gz) = aea434dc24aba3f1952e2a0aade8ed4e
+MD5 (librsvg-1.0.2.tar.gz) = 4bfa03ec2218ee29e8364c80e3c4a3ae
diff --git a/graphics/librsvg2/files/patch-librsvg-config.in b/graphics/librsvg2/files/patch-librsvg-config.in
new file mode 100644
index 000000000000..84d673894427
--- /dev/null
+++ b/graphics/librsvg2/files/patch-librsvg-config.in
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- librsvg-config.in 2001/10/05 14:55:24 1.1
++++ librsvg-config.in 2001/10/05 15:05:57
+@@ -39,9 +39,7 @@
+ echo @LIBRSVG_VERSION@
+ ;;
+ --cflags)
+- if test @includedir@ != /usr/include ; then
+- includes=-I@includedir@
+- fi
++ includes=-I@includedir@/librsvg-1
+ echo $includes
+ ;;
+ --libs)
diff --git a/graphics/librsvg2/files/patch-ltmain.sh b/graphics/librsvg2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/graphics/librsvg2/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh 2001/08/27 09:51:26 1.1
++++ ltmain.sh 2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 27700d6246ad..94cde0f2d87c 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,20 +1,21 @@
bin/librsvg-config
etc/librsvgConf.sh
-include/librsvg/art_render.h
-include/librsvg/art_render_gradient.h
-include/librsvg/art_render_mask.h
-include/librsvg/art_render_svp.h
-include/librsvg/art_rgba.h
-include/librsvg/librsvg-features.h
-include/librsvg/rsvg-bpath-util.h
-include/librsvg/rsvg-css.h
-include/librsvg/rsvg-defs.h
-include/librsvg/rsvg-ft.h
-include/librsvg/rsvg-paint-server.h
-include/librsvg/rsvg-path.h
-include/librsvg/rsvg.h
+include/librsvg-1/librsvg/art_render.h
+include/librsvg-1/librsvg/art_render_gradient.h
+include/librsvg-1/librsvg/art_render_mask.h
+include/librsvg-1/librsvg/art_render_svp.h
+include/librsvg-1/librsvg/art_rgba.h
+include/librsvg-1/librsvg/librsvg-features.h
+include/librsvg-1/librsvg/rsvg-bpath-util.h
+include/librsvg-1/librsvg/rsvg-css.h
+include/librsvg-1/librsvg/rsvg-defs.h
+include/librsvg-1/librsvg/rsvg-ft.h
+include/librsvg-1/librsvg/rsvg-paint-server.h
+include/librsvg-1/librsvg/rsvg-path.h
+include/librsvg-1/librsvg/rsvg.h
lib/librsvg.a
lib/librsvg.so
lib/librsvg.so.1
share/aclocal/librsvg.m4
-@dirrm include/librsvg
+@dirrm include/librsvg-1/librsvg
+@dirrm include/librsvg-1