summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/rhythmbox3/Makefile5
-rw-r--r--editors/gedit/Makefile3
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/gcalctool/pkg-plist1
-rw-r--r--net-im/folks04/Makefile3
-rw-r--r--net/gnome-nettool/Makefile9
-rw-r--r--sysutils/system-tools-backends/Makefile3
-rw-r--r--x11-themes/gnome-themes/Makefile5
-rw-r--r--x11-toolkits/libwnck/Makefile5
-rw-r--r--x11/libgnomekbd/Makefile5
10 files changed, 17 insertions, 26 deletions
diff --git a/audio/rhythmbox3/Makefile b/audio/rhythmbox3/Makefile
index 971c92850..f1273e940 100644
--- a/audio/rhythmbox3/Makefile
+++ b/audio/rhythmbox3/Makefile
@@ -8,6 +8,7 @@ PORTREVISION= 1
CATEGORIES= audio gnome
#MASTER_SITES= GNOME
MASTER_SITES= LOCAL/kwm
+PKGNAMESUFFIX= 3
DIST_SUBDIR= gnome3
MAINTAINER= marcus@FreeBSD.org
@@ -25,10 +26,8 @@ LIB_DEPENDS= libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
CONFLICTS= rhythmbox-0.[0-9]*
-NO_STAGE= yes
-LATEST_LINK= rhythmbox3
USE_BZIP2= yes
-USES= gettext gmake pathfix
+USES= gettext gmake pathfix pkgconfig
INSTALLS_OMF= yes
USE_XORG= ice xproto
USE_GNOME= intlhack gnomeprefix gtk30 introspection:build
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ec6bd8fed..fae3dd98f 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
CONFLICTS= gedit-3.[0-9]*
-NO_STAGE= yes
USE_XORG= sm
USE_BZIP2= yes
-USES= desktop-file-utils gettext gmake pathfix
+USES= desktop-file-utils gettext gmake pathfix pkgconfig
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 42d108040..1b2601bea 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -15,15 +15,13 @@ COMMENT= GNOME 2 calculator tool based on the old calctool for OpenWindows
CONFLICTS= gcalctool-6.[0-9]*
-NO_STAGE= yes
USE_BZIP2= yes
-USES= bison gettext gmake pathfix
+USES= bison gettext gmake pathfix pkgconfig
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix intlhack gconf2 gnomedocutils gtk20
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= gcalctool.1
GLIB_SCHEMAS= org.gnome.gcalctool.gschema.xml
.include <bsd.port.mk>
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 344ee94c5..cc8c91df8 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -1,6 +1,7 @@
bin/gcalccmd
bin/gcalctool
bin/gnome-calculator
+man/man1/gcalctool.1.gz
share/applications/gcalctool.desktop
%%DATADIR%%/buttons-advanced.ui
%%DATADIR%%/buttons-basic.ui
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index 02f1eabb7..02e86ed6e 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS= libgee.so:${PORTSDIR}/devel/libgee06 \
CONFLICTS= folks-0.[6-9].[0-9]*
-NO_STAGE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USES= pathfix gettext gmake
+USES= pathfix gettext gmake pkgconfig
USE_GNOME= intlhack gnomehier introspection:build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 2a76fd8a3..d20778b0e 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop
CONFLICTS= gnome-nettool-3.[0-9]*
-NO_STAGE= yes
USE_BZIP2= yes
USE_GNOME= intlhack gnomeprefix libglade2 gconf2 gnomedocutils
-USES= gettext gmake pathfix
+USES= gettext gmake pathfix pkgconfig
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
@@ -29,8 +28,8 @@ LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -DHAVE_SOCKADDR_SA_LEN
post-install:
- ${MKDIR} ${PREFIX}/share/pixmaps
- ${LN} -sf ${PREFIX}/share/gnome-nettool/pixmaps/gnome-nettool.png \
- ${PREFIX}/share/pixmaps/gnome-nettool.png
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
+ ${LN} -sf ${STAGEDIR}${PREFIX}/share/gnome-nettool/pixmaps/gnome-nettool.png \
+ ${STAGEDIR}${PREFIX}/share/pixmaps/gnome-nettool.png
.include <bsd.port.mk>
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 759b6e5f7..760d58abe 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
RUN_DEPENDS= p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
-NO_STAGE= yes
USE_BZIP2= yes
-USES= gmake pathfix perl5
+USES= gmake pathfix perl5 pkgconfig
USE_GNOME= intlhack glib20
GNU_CONFIGURE= yes
USE_GNOME_SUBR= yes
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index ab418dded..9c7d4b49d 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A collection of themes and icons for GNOME2
+COMMENT= Collection of themes and icons for GNOME2
BUILD_DEPENDS= gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 \
icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
@@ -17,9 +17,8 @@ RUN_DEPENDS= gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2
CONFLICTS= clearlooks-metacity-0.* gnome-themes-standard-3.[0-9]*
-NO_STAGE= yes
USE_BZIP2= yes
-USES= gettext gmake pathfix
+USES= gettext gmake pathfix pkgconfig
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix intlhack metacity gtk20
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index ab1cfee87..4c46aa6f6 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -13,15 +13,14 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Library used for writing pagers and taskslists
USE_XZ= yes
-NO_STAGE= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
USE_XORG= xres x11
USE_GNOME= gtk20 ltverhack referencehack intlhack introspection
-USES= bison gettext gmake pathfix
+USES= bison gettext gmake pathfix pkgconfig
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 3e5f76c21..3ba48ca4a 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -12,16 +12,15 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME keyboard shared library
-LIB_DEPENDS= xklavier:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS= libxklavier.so:${PORTSDIR}/x11/libxklavier
CONFLICTS= libgnomekbd-3.[0-9]*
-NO_STAGE= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix ltverhack gconf2
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
-USES= gettext gmake pathfix
+USES= gettext gmake pathfix pkgconfig
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib