Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

3 files changed, 23 insertions, 12 deletions

diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index b31e284bea36..b27d81474ddd 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Soboleb <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11/libcapplet/Makefile,v 1.4 2006/10/07 19:06:46 ahze Exp $
 
 PORTNAME=	libcapplet
 PORTVERSION=	1.4.0.5
-PORTREVISION=	3
+PORTREVISION=	7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://people.freebsd.org/~sobomax/
 DIST_SUBDIR=	gnome
@@ -16,11 +16,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for writing custom applets for GNOME Control Center
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GETOPT_LONG=yes
-MAKE_ENV=	X11BASE="${X11BASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	X11BASE="${LOCALBASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile
index caeb33b82976..72fec2549c4f 100644
--- a/x11/libcapplet/files/patch-Makefile
+++ b/x11/libcapplet/files/patch-Makefile
@@ -1,6 +1,14 @@
---- Makefile.orig	Wed Jul 10 05:32:05 2002
-+++ Makefile	Sun Jan 22 15:06:39 2006
-@@ -13,6 +13,6 @@
+--- Makefile.orig	Wed Jul 10 08:32:05 2002
++++ Makefile	Wed Oct  4 15:35:57 2006
+@@ -7,14 +7,14 @@
+ SRCS=	capplet-widget-libs.c capplet-widget.c capplet-widget-libs.h \
+ 	capplet-widget.h control-center-common.c control-center-skels.c \
+ 	control-center-stubs.c control-center.h
+-CFLAGS+=-I. -I${X11BASE}/include -I${X11BASE}/include/gtk12 \
+-	-I${X11BASE}/include/gnome-1.0 -I${LOCALBASE}/include \
++CFLAGS+=-I. -I${X11BASE}/include -I${LOCALBASE}/include/gtk12 \
++	-I${LOCALBASE}/include/gnome-1.0 -I${LOCALBASE}/include \
+ 	-I${LOCALBASE}/include/glib12 -I${LOCALBASE}/include/orbit-1.0
  LDADD+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \
 -	-lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
 -	-lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \
@@ -11,3 +19,5 @@
 +	-lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
 +	-lesd ${LDFLAGS} -laudiofile 
  
+ CLEANFILES+=control-center-common.c control-center-skels.c \
+ 	    control-center-stubs.c control-center.h cappletConf.sh \
diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in
index cc27c4874c78..ee73029fd555 100644
--- a/x11/libcapplet/files/patch-cappletConf.sh.in
+++ b/x11/libcapplet/files/patch-cappletConf.sh.in
@@ -1,7 +1,9 @@
---- cappletConf.sh.in.orig	Wed Jul 10 05:42:31 2002
-+++ cappletConf.sh.in	Sun Jan 22 21:22:31 2006
-@@ -1,3 +1,3 @@
+--- cappletConf.sh.in.orig	Wed Jul 10 08:42:31 2002
++++ cappletConf.sh.in	Sat Oct  7 15:03:42 2006
+@@ -1,4 +1,4 @@
  CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib"
 -CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba"
+-CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
 +CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba"
- CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
++CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12"
+ MODULE_VERSION="capplet-1.4.0.5"