summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/fusenshi/Makefile6
-rw-r--r--deskutils/fusenshi/files/patch-src-Makefile11
-rw-r--r--deskutils/glabels/Makefile1
-rw-r--r--deskutils/gnome-main-menu/files/patch-configure20
-rw-r--r--deskutils/gtimer/Makefile4
-rw-r--r--deskutils/mdh/Makefile3
-rw-r--r--deskutils/multisync/Makefile12
-rw-r--r--deskutils/multisync/files/patch-src-Makefile.am11
-rw-r--r--deskutils/notecase/Makefile3
-rw-r--r--deskutils/notecase/files/patch-Makefile2
-rw-r--r--deskutils/notify-osd/Makefile8
-rw-r--r--deskutils/xfce4-notification-daemon/Makefile2
12 files changed, 48 insertions, 35 deletions
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index 83a35b41e5b0..af15a3aad567 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -10,11 +10,9 @@ MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/
MAINTAINER= ozawa@ongs.co.jp
COMMENT= Post-it(R) like application with network support
-LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
- libgtksourceview-1.0.so:${PORTSDIR}/x11-toolkits/gtksourceview
-
USES= pkgconfig tar:tgz
-USE_GNOME= libxml2
+USE_GNOME= gtkmm24 gtksourceview libxml2
+USE_XORG= x11
MAKE_JOBS_UNSAFE= yes
.ifdef WITHOUT_SSL
diff --git a/deskutils/fusenshi/files/patch-src-Makefile b/deskutils/fusenshi/files/patch-src-Makefile
index 982850d61d5e..8621cfaf4c58 100644
--- a/deskutils/fusenshi/files/patch-src-Makefile
+++ b/deskutils/fusenshi/files/patch-src-Makefile
@@ -1,6 +1,15 @@
--- src/Makefile.orig 2014-07-05 00:11:32.020240534 +0800
+++ src/Makefile 2014-07-05 00:12:26.524236990 +0800
-@@ -98,12 +98,12 @@ build: ${OBJ}
+@@ -34,7 +34,7 @@
+ .include "../Makefile.inc"
+
+ LIB_DEPS= gtkmm-2.4 gdkmm-2.4 atkmm-1.6 pangomm-1.4 gtksourceview-1.0 \
+- gthread-2.0 libxml-2.0
++ gthread-2.0 libxml-2.0 x11
+
+ #ifndef WITHOUT_SSL
+ LIB_DEPS+= gnutls
+@@ -98,12 +98,12 @@
${CXX} ${CXXFLAGS} -o ${<:.cpp=.o} -c $<
install:
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index f1ace9cbe650..ddb8719322ca 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -34,5 +34,6 @@ CONFIGURE_ARGS+= --without-libebook
post-patch:
@${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
${WRKSRC}/iec16022-0.2.1/*.c
+ @${REINPLACE_CMD} 's/_LDADD =/& -lm/' ${WRKSRC}/src/Makefile.in
.include <bsd.port.post.mk>
diff --git a/deskutils/gnome-main-menu/files/patch-configure b/deskutils/gnome-main-menu/files/patch-configure
index 9f32bd6394d0..3f51291b9e29 100644
--- a/deskutils/gnome-main-menu/files/patch-configure
+++ b/deskutils/gnome-main-menu/files/patch-configure
@@ -6,13 +6,13 @@
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5
- ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5
-+ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 \"") >&5
++ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>/dev/null`
-+ pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>/dev/null`
++ pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22,13 +22,13 @@
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5
- ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5
-+ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 \"") >&5
++ ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>/dev/null`
-+ pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>/dev/null`
++ pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -37,16 +37,16 @@
fi
if test $_pkg_short_errors_supported = yes; then
- MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>&1`
-+ MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>&1`
++ MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>&1`
else
- MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>&1`
-+ MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>&1`
++ MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$MAIN_MENU_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met:
++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ) were not met:
$MAIN_MENU_PKG_ERRORS
@@ -55,7 +55,7 @@
See the pkg-config man page for more details.
" >&5
-$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met:
-+$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met:
++$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo x11 ) were not met:
$MAIN_MENU_PKG_ERRORS
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index e96957f9cd81..57dfbe0d17e5 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -14,13 +14,13 @@ LICENSE= GPLv2
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
-USE_XORG= xscrnsaver
+USE_XORG= x11 xscrnsaver
USE_GNOME= gtk20
USES= gettext perl5 gmake pkgconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -Wno-return-type
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib -lX11
post-patch:
@${REINPLACE_CMD} -e 's|1.1.7|${PORTVERSION}|g' ${WRKSRC}/configure
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 905c38a5d65c..b20dc4c3421e 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -14,10 +14,11 @@ LICENSE= GPLv2 # (or later)
USE_GNOME= gtk20
USES= gmake pkgconfig tar:bzip2
+USE_XORG= x11
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib -lX11
OPTIONS_DEFINE= CURL DOCS GTOP
OPTIONS_DEFAULT= CURL GTOP
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 03399768ca0b..32650ea99e86 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -11,12 +11,10 @@ DISTNAME= multisync-${PORTVERSION}
MAINTAINER?= ports@FreeBSD.org
COMMENT?= Synchronize calendars, addressbooks, and other PIM data
-WRKSRC?= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
USE_GNOME= gnomeprefix libgnomeui
USES= gmake libtool pathfix pkgconfig tar:bzip2
-USE_AUTOTOOLS= libtoolize aclocal autoconf automake
-AUTOMAKE_ARGS= --add-missing
+USE_AUTOTOOLS= libtoolize aclocal autoconf autoheader automake
+AUTOMAKE_ARGS= -a -c -f
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
@@ -24,11 +22,5 @@ MAKE_JOBS_UNSAFE= yes
pre-configure:
@${FIND} ${WRKDIR} -type l -delete
-.for FILE in missing install-sh mkinstalldirs config.guess config.sub depcomp
- @${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRC}
- @${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRCMASTER}
-.endfor
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-lpthread||'
.include <bsd.port.mk>
diff --git a/deskutils/multisync/files/patch-src-Makefile.am b/deskutils/multisync/files/patch-src-Makefile.am
new file mode 100644
index 000000000000..b26f1df890a5
--- /dev/null
+++ b/deskutils/multisync/files/patch-src-Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -23,7 +23,7 @@
+
+ multisync_LDFLAGS = -rdynamic
+
+-multisync_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lpthread -L./libversit -lversit
++multisync_LDADD = @PACKAGE_LIBS@ -lX11 $(INTLLIBS) -lpthread -L./libversit -lversit
+
+ SUBDIRS = libversit
+
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index c162df5ecf3b..d9a7cc9d2d0d 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -13,8 +13,9 @@ COMMENT= Hierarchical text notes manager
LICENSE= BSD3CLAUSE
-USE_GNOME= gtk20 gtksourceview2 gnomevfs2
USES= dos2unix gmake desktop-file-utils gettext pkgconfig shared-mime-info
+USE_GNOME= gtk20 gtksourceview2 gnomevfs2
+USE_XORG= x11
DOS2UNIX_REGEX= .*\.(c|h|cpp)
diff --git a/deskutils/notecase/files/patch-Makefile b/deskutils/notecase/files/patch-Makefile
index e80a34e57d30..166b563540bd 100644
--- a/deskutils/notecase/files/patch-Makefile
+++ b/deskutils/notecase/files/patch-Makefile
@@ -13,7 +13,7 @@
else
$(BIN)/notecase$(EXE): updatesrc $(OBJS)
- $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) > /dev/null
-+ $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) -lz > /dev/null
++ $(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) -lX11 -lz > /dev/null
endif
#
diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile
index 525ad9245f75..a714ee0efc0d 100644
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@@ -13,18 +13,18 @@ COMMENT= On-screen-display notification agent using libnotify
LICENSE= GPLv3
-CONFLICTS= xfce4-notification-daemon-[0-9]*
-
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libnotify.so:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus
+CONFLICTS= xfce4-notification-daemon-[0-9]*
+
GNU_CONFIGURE= yes
USES= gmake libtool pkgconfig
USE_GNOME= libwnck gconf2
-USE_XORG= pixman
+USE_XORG= pixman x11
-LDFLAGS+= -L${LOCALBASE}/lib -lpixman-1
+LIBS+= -L${LOCALBASE}/lib -lpixman-1 -lX11
.include <bsd.port.options.mk>
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 1bc464a25a89..0f2bccdad1e3 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -62,7 +62,7 @@ post-patch:
${WRKSRC}/src/daemon/Makefile.in \
${WRKSRC}/src/themes/bubble/Makefile.in \
${WRKSRC}/src/themes/standard/Makefile.in
- @${REINPLACE_CMD} '/GTK_LIBS =/s/$$/ -lgmodule-2.0/' \
+ @${REINPLACE_CMD} '/GTK_LIBS =/s/$$/ -lgmodule-2.0 -lX11/' \
${WRKSRC}/src/daemon/Makefile.in
.if empty(PORT_OPTIONS:MNLS)
@${REINPLACE_CMD} -e 's|\(USE_NLS=\)yes|\1no|' ${WRKSRC}/configure
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 21:06:51 +0000