summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-18 03:06:48 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-18 03:06:48 +0800
commite1fad6b7b570f2f5685fb302a460b50679e04ae8 (patch)
tree6bdaaaa51925e10719a04696aa74e5d389db0195 /www
parentd6f2b76b19d2ae10403b675e549d5d5a8279079d (diff)
downloadmarcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.gz
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.zst
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.zip
Sync with freebsd ports. portrevision bumping, getting CPPFLAGS/LDFLAGS from
CONFIGURE_ENV, s/CPPFLAGS=/CPPFLAGS+=/ etc Sprinkle USE_PKGCONFIG in some ports. Some small nits here and there. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17047 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
-rw-r--r--www/epiphany-extensions/Makefile8
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/webkit-gtk2/files/patch-configure9
-rw-r--r--www/webkit-gtk3/files/patch-configure9
4 files changed, 6 insertions, 24 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index bf11d5f25..b369dfd1a 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.136 2011/04/30 20:43:27 mezz Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.137 2012/02/14 19:34:00 kwm Exp $
#
PORTNAME= epiphany-extensions
PORTVERSION= 2.30.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,8 +29,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
EPHY_EXTENSIONS=really-all
EPHY_VERSION= ${PORTVERSION:R}
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 356850665..ebf57767a 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.182 2011/10/24 08:17:47 kwm Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.183 2012/03/13 01:34:32 mezz Exp $
#
PORTNAME= gtkhtml3
PORTVERSION= 3.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
index 6cb7fa58b..dd277a8cc 100644
--- a/www/webkit-gtk2/files/patch-configure
+++ b/www/webkit-gtk2/files/patch-configure
@@ -1,14 +1,5 @@
--- configure.orig 2012-08-04 12:19:43.000000000 +0200
+++ configure 2012-08-04 13:15:32.000000000 +0200
-@@ -17704,7 +17704,7 @@
- fi
- case $host in
- i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
--|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
-+|amd64-*-freebsd*|i?86-*-freebsd*|amd64-*-freebsd*|ia64-*-freebsd*)
- pic_options='-fPIC'
- ;;
- i?86-apple-darwin*)
@@ -19144,8 +19144,8 @@
.SECONDARY: $(gsettings_SCHEMAS)
diff --git a/www/webkit-gtk3/files/patch-configure b/www/webkit-gtk3/files/patch-configure
index 60b18be03..8466810cd 100644
--- a/www/webkit-gtk3/files/patch-configure
+++ b/www/webkit-gtk3/files/patch-configure
@@ -1,14 +1,5 @@
--- configure.orig 2012-05-16 12:57:04.000000000 +0200
+++ configure 2012-05-16 14:00:03.000000000 +0200
-@@ -17704,7 +17704,7 @@
- fi
- case $host in
- i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
--|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
-+|amd64-*-freebsd*|i?86-*-freebsd*|amd64-*-freebsd*|ia64-*-freebsd*)
- pic_options='-fPIC'
- ;;
- i?86-apple-darwin*)
@@ -19144,8 +19144,8 @@
.SECONDARY: $(gsettings_SCHEMAS)