aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/alltray/Makefile10
-rw-r--r--x11/bbrun/Makefile2
-rw-r--r--x11/bbrun/files/patch-Makefile6
-rw-r--r--x11/brightside/Makefile4
-rw-r--r--x11/fbpanel/Makefile3
-rw-r--r--x11/gnome-applets/Makefile11
-rw-r--r--x11/gnome-clipboard-daemon/Makefile10
-rw-r--r--x11/gnome-swallow/Makefile10
-rw-r--r--x11/gromit/Makefile4
-rw-r--r--x11/gromit/files/patch-Makefile5
-rw-r--r--x11/sbxkb/Makefile4
-rw-r--r--x11/simdock/Makefile3
-rw-r--r--x11/sisctrl/Makefile2
-rw-r--r--x11/stjerm/Makefile12
-rw-r--r--x11/wmcliphist/Makefile2
-rw-r--r--x11/wmcliphist/files/patch-Makefile19
16 files changed, 68 insertions, 39 deletions
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index f286f14a040e..ad2e67e00f09 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -15,7 +15,7 @@ USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= KDE
KDE_DESC= Support only KDE desktop
@@ -29,8 +29,12 @@ USE_GNOME+= gconf2
post-patch:
@${CHMOD} +x ${WRKSRC}/install-sh
- @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lib/Makefile.in
- @${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||' ${WRKSRC}/src/Makefile.in
+ @${REINPLACE_CMD} \
+ -e 's|-ldl||' -e '/^liballtray_la_LIBADD =/s/$$/ -lX11/' \
+ ${WRKSRC}/lib/Makefile.in
+ @${REINPLACE_CMD} \
+ -e 's|-L/usr/X11R6/lib||' -e '/^alltray_LDADD =/s/$$/ -lX11/' \
+ ${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e 's|/etc/gconf|${LOCALBASE}/etc/gconf|; \
/THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/themes/|' \
${WRKSRC}/src/gnome_theme.c
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index da8d6dd8b325..3fb7edd6c065 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -14,7 +14,7 @@ OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun
-USE_XORG= xpm
+USE_XORG= x11 xext xpm
USE_GNOME= gtk20
USES= gmake pkgconfig
USE_CSTD= gnu89
diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile
index 7144020704a9..1605750fa0bd 100644
--- a/x11/bbrun/files/patch-Makefile
+++ b/x11/bbrun/files/patch-Makefile
@@ -5,9 +5,9 @@
-LIBDIR = -L/usr/lib -L/usr/X11R6/lib
-LIBS = -lXpm `pkg-config --libs gtk+-2.0`
-CFLAGS = `pkg-config --cflags gtk+-2.0`
-+LIBDIR = -L${LOCALBASE}/lib
-+LIBS = -lXpm `pkg-config --libs gtk+-2.0` ${LDFLAGS}
-+CFLAGS += `pkg-config --cflags gtk+-2.0`
++LIBDIR =
++LIBS = ${LDFLAGS} `pkg-config --libs gtk+-2.0 x11 xext xpm`
++CFLAGS += `pkg-config --cflags gtk+-2.0 x11 xext xpm`
OBJS = bbrun.o \
../wmgeneral/wmgeneral.o \
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index fdad585953b7..4363c2ea5277 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -11,12 +11,12 @@ MAINTAINER= marcus@FreeBSD.org
COMMENT= Tool to add reactivity to the edges and corners of the GNOME desktop
USES= gmake pathfix pkgconfig tar:bzip2
-USE_XORG= x11 xt
+USE_XORG= x11
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix libwnck libgnomeui
CONFIGURE_ARGS= --enable-tray-icon
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib -lX11
GCONF_SCHEMAS= brightside.schemas
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 81abc268eb9c..1a010f02a45d 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -15,6 +15,7 @@ LICENSE= MIT
USES= gmake pkgconfig tar:bzip2
USE_GNOME= gtk20
+USE_XORG= x11
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
@@ -26,6 +27,8 @@ DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \
"${PORTNAME}" "${PORTNAME}" "System;" false
post-patch:
+ @${REINPLACE_CMD} -e '/LDFLAGS/s/$$/ -lX11 -lm/' \
+ ${WRKSRC}/panel/Makefile.in
@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/scripts/install.sh
@${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \
${WRKSRC}/data/man/${PORTNAME}.1.in
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 825a562ade55..843f72183f89 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-mixer-applet \
--disable-networkmanager
CONFIGURE_ENV= OS_SYS="/usr/include"
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
mixer.schemas multiload.schemas stickynotes.schemas
@@ -78,7 +78,6 @@ IGNORE= Python bindings for gnomedesktop are unsupported on ${ARCH}"
.endif
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-CFLAGS+= -fPIC
PLIST_SUB+= BATTERY="@comment "
.else
GCONF_SCHEMAS+= battstat.schemas
@@ -95,6 +94,12 @@ GCONF_SCHEMAS+= cpufreq-applet.schemas
post-patch:
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|" == "|" = "|g'
+ @${REINPLACE_CMD} '/^geyes_applet2_LDADD =/s/=/= -lm/' \
+ ${WRKSRC}/geyes/Makefile.in
+ @${REINPLACE_CMD} '/^stickynotes_applet_LDADD =/s/=/= $$(X_LIBS)/' \
+ ${WRKSRC}/stickynotes/Makefile.in
+ @${REINPLACE_CMD} '/^trashapplet_LDADD =/s/=/= $$(X_LIBS)/' \
+ ${WRKSRC}/trashapplet/src/Makefile.in
.if !defined(USE_PYTHON)
@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
${WRKSRC}/configure
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 4c8ecba5de71..fd2650226cac 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -14,14 +14,16 @@ LICENSE= GPLv2
USES= pkgconfig tar:bzip2
USE_GNOME= gtk20
+USE_XORG= x11
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}"
PLIST_FILES= bin/${PORTNAME}
post-patch:
- @${REINPLACE_CMD} -e \
- 's|^CC=|CC?=| ; \
- s|^CFLAGS=|CFLAGS?=| ; \
- s|-o clipboard-daemon |-o ${PORTNAME} |' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} \
+ -e 's|-o clipboard-daemon |-o ${PORTNAME} |' \
+ -e 's/gtk+-2\.0/& x11/' \
+ ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index c48f33cc1a85..9758a54e84be 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -10,17 +10,17 @@ MASTER_SITES= http://interreality.org/~tetron/technology/swallow/
MAINTAINER= marcus@FreeBSD.org
COMMENT= Applet that swallows any X11 application into the GNOME 2 panel
-USE_XORG= x11
USES= gmake pathfix pkgconfig
USE_GNOME= gnomeprefix gnomepanel libgnomeui
+USE_XORG= x11
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
-LIBS+= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/GNOME_Swallow.server
+ @${REINPLACE_CMD} 's/libpanelapplet-2.0/& libgnomeui-2.0 x11/' \
+ ${WRKSRC}/Makefile.in
.include <bsd.port.mk>
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index e93812e17915..bead657e8d78 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/
MAINTAINER= ports@FreeBSD.org
COMMENT= GRaphics Over Miscellaneous Objects (Gromit)
-USE_GNOME= gtk20
USES= pkgconfig
-CFLAGS+= -lm
+USE_GNOME= gtk20
+USE_XORG= x11
DOCS= AUTHORS ChangeLog README
diff --git a/x11/gromit/files/patch-Makefile b/x11/gromit/files/patch-Makefile
index 0f41bedb2776..e0309e0a8bd6 100644
--- a/x11/gromit/files/patch-Makefile
+++ b/x11/gromit/files/patch-Makefile
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- Makefile.orig
+++ Makefile
@@ -7,4 +7,4 @@
@@ -8,4 +5,4 @@ $FreeBSD$
gromit: gromit.c Makefile
- gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0`
-+ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0`
++ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0 x11` -lm
diff --git a/x11/sbxkb/Makefile b/x11/sbxkb/Makefile
index 5952faf62d73..c49c75c92322 100644
--- a/x11/sbxkb/Makefile
+++ b/x11/sbxkb/Makefile
@@ -13,8 +13,10 @@ LICENSE= GPLv3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
-USE_GNOME= gtk20
+LIBS+= -L${LOCALBASE}/lib -lX11
USES= pkgconfig
+USE_GNOME= gtk20
+USE_XORG= x11
post-patch:
# Remove debug flag (-g) from CFLAGS
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 9b6254d96a89..1c20adb0c1dc 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -19,6 +19,7 @@ GNU_CONFIGURE= yes
USES= desktop-file-utils pathfix pkgconfig
USE_GNOME= gnomeprefix gconf2 libwnck
USE_WX= 2.8
+USE_XORG= x11
WX_UNICODE= yes
WX_CONF_ARGS= absolute
@@ -30,6 +31,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
${WRKSRC}/Makefile.in \
${WRKSRC}/src/main.h
+ @${REINPLACE_CMD} '/^simdock_LDADD =/s/$$/ -lX11/' \
+ ${WRKSRC}/Makefile.in ${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
-e 's|/usr/share/firefox|${PREFIX}/lib/firefox|g' \
${WRKSRC}/src/main.cc
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 63f49cf78ef2..0cb7dfaaf559 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -16,7 +16,7 @@ USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xv-path=${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib -lm
PLIST_FILES= bin/sisctrl man/man1/sisctrl.1x.gz
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index eb2a4ee79845..11318d8dcd94 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -9,15 +9,17 @@ MASTER_SITES= http://stjerm-terminal.googlecode.com/files/
MAINTAINER= lichray@gmail.com
COMMENT= GTK+-based quake-like terminal emulator
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+GNU_CONFIGURE= yes
+LIBS+= -L${LOCALBASE}/lib -lXinerama
+USES= gmake pkgconfig
USE_AUTOTOOLS= aclocal autoheader automake
AUTOMAKE_ARGS= --add-missing
-ACLOCAL_ARGS= --automake-acdir=${ACLOCAL_DIR} \
- -I${LOCALBASE}/share/aclocal
USE_GNOME= vte gtk20
-GNU_CONFIGURE= yes
-USES= gmake pkgconfig
+USE_XORG= xinerama
-LICENSE_FILE= ${WRKSRC}/COPYING
PLIST_FILES= bin/stjerm man/man8/${PORTNAME}.8.gz
.include <bsd.port.mk>
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index d7970d3319a3..4fe05c18dabd 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -15,8 +15,8 @@ COMMENT= Clipboard history management dockapp for Window Maker
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= pkgconfig
-USE_XORG= xpm
USE_GNOME= gtk20
+USE_XORG= x11
OPTIONS_DEFINE= DOCS
diff --git a/x11/wmcliphist/files/patch-Makefile b/x11/wmcliphist/files/patch-Makefile
index 3b297e3c13de..319e5225db69 100644
--- a/x11/wmcliphist/files/patch-Makefile
+++ b/x11/wmcliphist/files/patch-Makefile
@@ -1,7 +1,10 @@
--- Makefile.orig
+++ Makefile
-@@ -3,7 +3,7 @@
- INCLUDES = `pkg-config --cflags gtk+-2.0` -I. -Ifoodock
+@@ -1,9 +1,9 @@
+ CC ?= gcc
+ PREFIX = /usr/local
+-INCLUDES = `pkg-config --cflags gtk+-2.0` -I. -Ifoodock
++INCLUDES = `pkg-config --cflags gtk+-2.0 x11` -I. -Ifoodock
# for normal use
-CFLAGS += -Wall -ansi -pedantic $(INCLUDES)
@@ -9,8 +12,16 @@
DEBUG =
# for debuggind purposes
-@@ -22,8 +22,8 @@
- lclint:
+@@ -12,7 +12,7 @@ DEBUG =
+ #CFLAGS += -Wall -g -ansi $(INCLUDES) -DFNCALL_DEBUG
+ #DEBUG = debug.o
+
+-LIBS = `pkg-config --libs gtk+-2.0`
++LIBS = `pkg-config --libs gtk+-2.0 x11`
+
+ OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o utils.o $(DEBUG)
+ TARGET = wmcliphist
+@@ -23,7 +23,7 @@ lclint:
lclint $(INCLUDES) +posixlib *.c >lclint.log
wmcliphist: $(OBJECTS) foodock/foodock.o
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 02:13:28 +0000