summaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/gnustep-back/Makefile3
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-toolkits/pango/files/patch-pangoxft.h11
-rw-r--r--x11-toolkits/qt23/Makefile6
-rw-r--r--x11-toolkits/qt23/files/patch-Makefile.in11
-rw-r--r--x11-toolkits/qt23/files/patch-configure11
-rw-r--r--x11-toolkits/qt23/files/patch-qpsprinter.cpp11
-rw-r--r--x11-toolkits/qt31/Makefile3
-rw-r--r--x11-toolkits/qt32/Makefile3
-rw-r--r--x11-toolkits/qt33/Makefile3
12 files changed, 46 insertions, 22 deletions
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index c89a259..665405f 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff
+ tiff.4:${PORTSDIR}/graphics/tiff \
+ Xft.2:${PORTSDIR}/x11-fonts/Xft
USE_XLIB= yes
BREAKS_IF_PEDANTIC= yes
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 0c008a6..5605854 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -49,8 +49,6 @@ MAN1= gdk-pixbuf-csource.1
post-patch:
@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|Xft\.h|Xft2.h|g'
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 0c008a6..5605854 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -49,8 +49,6 @@ MAN1= gdk-pixbuf-csource.1
post-patch:
@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|Xft\.h|Xft2.h|g'
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 0a9b901..fe93b85 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \
- Xft2.2:${PORTSDIR}/x11-fonts/Xft \
+ Xft.2:${PORTSDIR}/x11-fonts/Xft \
intl.4:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
diff --git a/x11-toolkits/pango/files/patch-pangoxft.h b/x11-toolkits/pango/files/patch-pangoxft.h
deleted file mode 100644
index 9391940..0000000
--- a/x11-toolkits/pango/files/patch-pangoxft.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- pango/pangoxft.h.orig Sun Oct 6 23:03:37 2002
-+++ pango/pangoxft.h Sun Oct 6 23:03:42 2002
-@@ -31,7 +31,7 @@
- #define _XFT_NO_COMPAT
- #define _XFTCOMPAT_H_
- #include <X11/Xlib.h>
--#include <X11/Xft/Xft.h>
-+#include <X11/Xft/Xft2.h>
- #if defined(XftVersion) && XftVersion >= 20000
- #else
- #error "must have Xft version 2 or newer"
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 41f9f95..95d6620 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -18,7 +18,8 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ Xft.2:${PORTSDIR}/x11-fonts/Xft
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -29,7 +30,8 @@ HAS_CONFIGURE= yes
# JUST BECAUSE -xft IS NOT LISTED BELOW DOESN'T MEAN IT'S NOT THERE!
CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
-system-libmng -thread -no-opengl -no-g++-exceptions \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib
+ -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+ -L${LOCALBASE}/lib
.if defined(QT_DEBUG)
CONFIGURE_ARGS+= -debug
diff --git a/x11-toolkits/qt23/files/patch-Makefile.in b/x11-toolkits/qt23/files/patch-Makefile.in
new file mode 100644
index 0000000..632a620
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig Wed Jun 13 01:57:02 2001
++++ src/Makefile.in Sun Feb 9 23:31:39 2003
+@@ -8,7 +8,7 @@
+ CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
+ INCPATH =
+ LFLAGS = $(SYSCONF_LFLAGS_OPENGL) $(SYSCONF_LFLAGS_X11) $(SYSCONF_RPATH_X11) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
+-LIBS = $(SUBLIBS) $(SYSCONF_LIBS_OPENGL) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS_QTLIB)
++LIBS = $(SUBLIBS) $(SYSCONF_LIBS_OPENGL) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS_QTLIB) `pkg-config xft --libs`
+ MOC = $(SYSCONF_MOC)
+ UIC = $(SYSCONF_UIC)
+
diff --git a/x11-toolkits/qt23/files/patch-configure b/x11-toolkits/qt23/files/patch-configure
new file mode 100644
index 0000000..40db4b2
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Wed Jun 13 01:57:02 2001
++++ configure Mon Feb 17 18:54:28 2003
+@@ -1209,7 +1209,7 @@
+ fi
+
+ [ "x$SM" = "xyes" ] && QT_LIBS="${QT_LIBS} -lSM -lICE"
+-[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} -lXft"
++[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} `pkg-config xft --libs`"
+ if [ -z "$EMB" -o "$SHARED" = no ]
+ then
+ [ "x$LIBPNG" = "xyes" ] && QT_MODOBJ=$QT_MODOBJ' $(PNG_OBJECTS)'
diff --git a/x11-toolkits/qt23/files/patch-qpsprinter.cpp b/x11-toolkits/qt23/files/patch-qpsprinter.cpp
new file mode 100644
index 0000000..21b9fdf
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-qpsprinter.cpp
@@ -0,0 +1,11 @@
+--- src/kernel/qpsprinter.cpp.orig Wed Jun 13 01:53:46 2001
++++ src/kernel/qpsprinter.cpp Sun Feb 9 22:48:14 2003
+@@ -2772,7 +2772,7 @@
+
+
+ #ifndef _OS_OSF_
+-extern "C" char* getenv(char*);
++extern "C" char* getenv(const char*);
+ #endif
+
+ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFont &f, QByteArray& d)
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index bfc49b8..e23d3a1 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -22,7 +22,8 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ Xft.2:${PORTSDIR}/x11-fonts/Xft
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index bfc49b8..e23d3a1 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -22,7 +22,8 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ Xft.2:${PORTSDIR}/x11-fonts/Xft
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index bfc49b8..e23d3a1 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -22,7 +22,8 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
- jpeg.9:${PORTSDIR}/graphics/jpeg
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ Xft.2:${PORTSDIR}/x11-fonts/Xft
USE_BZIP2= yes
USE_GMAKE= yes
OpenPOWER on IntegriCloud