diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libcapplet/Makefile | 6 | ||||
| -rw-r--r-- | x11/libcapplet/files/patch-Makefile | 16 | ||||
| -rw-r--r-- | x11/libcapplet/files/patch-cappletConf.sh.in | 13 |
3 files changed, 23 insertions, 12 deletions
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile index 5493de1e6..eb23c657d 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.1 2006/07/18 15:53:17 ahze Exp $ +# $MCom: ports/x11/libcapplet/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $ PORTNAME= libcapplet PORTVERSION= 1.4.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= http://people.freebsd.org/~sobomax/ DIST_SUBDIR= gnome @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_GNOME= gnomelibs 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 caeb33b82..72fec2549 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 cc27c4874..5638ef5e3 100644 --- a/x11/libcapplet/files/patch-cappletConf.sh.in +++ b/x11/libcapplet/files/patch-cappletConf.sh.in @@ -1,7 +1,8 @@ ---- 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 Oct 4 15:36:44 2006 ++++ cappletConf.sh.in Wed Oct 4 15:37:24 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_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_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_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" |