diff options
45 files changed, 66 insertions, 186 deletions
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile index 5fdb9a726..9968bf25a 100644 --- a/audio/audacity-devel/Makefile +++ b/audio/audacity-devel/Makefile @@ -2,7 +2,7 @@ # Date created: 14 Sep 2006 # Whom: Jackson Low <xxjack12xx@gmail.com> # -# $FreeBSD: ports/audio/audacity-devel/Makefile,v 1.37 2009/10/22 08:36:03 wen Exp $ +# $FreeBSD$ PORTNAME= audacity PORTVERSION= 1.3.9 @@ -16,6 +16,8 @@ DISTNAME= ${PORTNAME}-minsrc-${PORTVERSION} MAINTAINER= xxjack12xx@gmail.com COMMENT= Audacity is a GUI editor for digital audio waveforms +BUILD_DEPENDS+= automake-1.10:${PORTSDIR}/devel/automake110 +BUILD_DEPENDS+= autoconf-2.62:${PORTSDIR}/devel/autoconf262 LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile CONFLICTS= audacity-[0-9]* diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile index 46362988a..b3329919a 100644 --- a/cad/geda-gattrib/Makefile +++ b/cad/geda-gattrib/Makefile @@ -2,7 +2,7 @@ # Date created: 26 June 2006 # Whom: Stanislav Sedov <ssedov@mbsd.msk.ru> # -# $FreeBSD: ports/cad/geda-gattrib/Makefile,v 1.12 2009/07/31 13:49:20 dinoex Exp $ +# $FreeBSD$ # PORTNAME= gattrib diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index a5f913645..7e0fcc129 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -2,7 +2,7 @@ # Date created: 7 Mar 2008 # Whom: Denise H. G. <darcsis@gmail.com> # -# $FreeBSD: ports/converters/pdf2djvu/Makefile,v 1.12 2009/09/19 12:48:57 miwi Exp $ +# $FreeBSD$ # PORTNAME= pdf2djvu diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile index ab2753558..8c03173f3 100644 --- a/databases/libgdamm/Makefile +++ b/databases/libgdamm/Makefile @@ -2,8 +2,8 @@ # Date created: 1 Oct 2003 # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # -# $FreeBSD: ports/databases/libgdamm/Makefile,v 1.32 2009/08/02 19:32:44 mezz Exp $ -# $MCom: ports/databases/libgdamm/Makefile,v 1.15 2009/04/09 03:24:07 mezz Exp $ +# $FreeBSD$ +# $MCom: ports/databases/libgdamm/Makefile,v 1.17 2009/10/02 15:07:51 kwm Exp $ # PORTNAME= libgdamm diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile index c52ade9da..3c3e69588 100644 --- a/databases/mysql-gui-tools/Makefile +++ b/databases/mysql-gui-tools/Makefile @@ -3,7 +3,7 @@ # Date created: 6 March 2008 # Whom: gahr # -# $FreeBSD: ports/databases/mysql-gui-tools/Makefile,v 1.8 2009/08/02 19:32:46 mezz Exp $ +# $FreeBSD$ # PORTNAME= mysql-gui-tools diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile index 692844654..85aea6509 100644 --- a/deskutils/evolution-jescs/Makefile +++ b/deskutils/evolution-jescs/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.38 2009/07/24 10:42:05 kwm Exp $ +# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.39 2009/09/22 12:28:17 avl Exp $ # PORTNAME= evolution-jescs @@ -26,6 +26,7 @@ INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MAKE_JOBS_UNSAFE= yes EVO_VERSION= 2.28 PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.28" diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile index 7e956c0d1..c8601f666 100644 --- a/deskutils/gnotime/Makefile +++ b/deskutils/gnotime/Makefile @@ -2,8 +2,8 @@ # Date created: 1 March 2003 # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # -# $FreeBSD: ports/deskutils/gnotime/Makefile,v 1.33 2009/08/22 00:17:42 amdmi3 Exp $ -# $MCom: ports/deskutils/gnotime/Makefile,v 1.21 2007/05/19 21:36:03 marcus Exp $ +# $FreeBSD$ +# $MCom: ports/deskutils/gnotime/Makefile,v 1.23 2009/09/28 10:12:40 kwm Exp $ # PORTNAME= gnotime diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 6415a31c6..648681d74 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap/Makefile,v 1.63 2009/09/21 18:15:31 kwm Exp $ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.64 2009/10/19 20:18:23 kwm Exp $ # PORTNAME= gucharmap @@ -11,7 +11,6 @@ PORTVERSION= 2.28.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 -DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= A Unicode/ISO10646 character map and font viewer diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index 6dd944446..9cf449f30 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -2,8 +2,8 @@ # Date created: 2005-09-17 # Whom: Michael Johnson <ahze@FreeBSD.org> # -# $FreeBSD: ports/deskutils/nautilus-locked-folder/Makefile,v 1.17 2009/08/02 19:33:00 mezz Exp $ -# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.9 2009/04/07 03:12:16 marcus Exp $ +# $FreeBSD$ +# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.11 2009/09/27 12:56:22 kwm Exp $ # PORTNAME= nautilus-locked-folder diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 6b475f96b..0c476229d 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/devel/dbus/Makefile,v 1.32 2009/09/26 13:41:58 marcus Exp $ # PORTNAME= dbus @@ -36,6 +36,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ USE_RC_SUBR= dbus USE_GNOME_SUBR= yes +USERS= messagebus +GROUPS= messagebus + PLIST_SUB= VERSION="1.0" MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \ diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install index 4ed46afa7..5ad0a1f84 100644 --- a/devel/dbus/pkg-install +++ b/devel/dbus/pkg-install @@ -4,33 +4,6 @@ case $2 in POST-INSTALL) USER=messagebus GROUP=${USER} - UID=556 - GID=${UID} - PW=/usr/sbin/pw - - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "D-BUS Daemon User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus /usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index 1244260e2..32301604a 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # -# $FreeBSD: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.10 2009/01/10 05:21:21 marcus Exp $ -# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.20 2008/08/06 04:22:49 mezz Exp $ +# $FreeBSD$ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.22 2009/10/10 16:04:54 marcus Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index e5a099a87..6bd0c82bf 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # -# $FreeBSD: ports/devel/gnome-vfs/pkg-install.in,v 1.10 2009/01/10 05:21:21 marcus Exp $ -# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.20 2008/08/06 04:22:49 mezz Exp $ +# $FreeBSD$ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.22 2009/10/10 16:04:54 marcus Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index b0df027f0..952732fd0 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/devel/liboobs/Makefile,v 1.35 2008/03/09 18:52:59 mezz Exp $ # PORTNAME= liboobs -PORTVERSION= 2.22.1 -PORTREVISION= 1 +PORTVERSION= 2.22.2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo index 9e0c600db..7521018e6 100644 --- a/devel/liboobs/distinfo +++ b/devel/liboobs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/liboobs-2.22.1.tar.bz2) = aa249b4b02ab5fee6d1bb91eea48945e -SHA256 (gnome2/liboobs-2.22.1.tar.bz2) = e2e82ead07471ae3350c9c40b9968e8c64a4d6a5e337fd47f6f48861d13eb701 -SIZE (gnome2/liboobs-2.22.1.tar.bz2) = 355304 +MD5 (gnome2/liboobs-2.22.2.tar.bz2) = 84d20702942635e3bebc0c1c35bdad43 +SHA256 (gnome2/liboobs-2.22.2.tar.bz2) = 34a972fab68255902d4c1f82ba16dfbf673f9933f78c68b4551883b63984c58b +SIZE (gnome2/liboobs-2.22.2.tar.bz2) = 364260 diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist index f6cb6c5e0..11e1ab182 100644 --- a/devel/liboobs/pkg-plist +++ b/devel/liboobs/pkg-plist @@ -32,50 +32,5 @@ lib/liboobs-1.la lib/liboobs-1.so lib/liboobs-1.so.4 libdata/pkgconfig/liboobs-1.pc -%%DOCSDIR%%/OobsGroup.html -%%DOCSDIR%%/OobsGroupsConfig.html -%%DOCSDIR%%/OobsIface.html -%%DOCSDIR%%/OobsIfaceEthernet.html -%%DOCSDIR%%/OobsIfaceIRLan.html -%%DOCSDIR%%/OobsIfacePlip.html -%%DOCSDIR%%/OobsIfaceWireless.html -%%DOCSDIR%%/OobsIfacesConfig.html -%%DOCSDIR%%/OobsList.html -%%DOCSDIR%%/OobsNFSConfig.html -%%DOCSDIR%%/OobsNTPConfig.html -%%DOCSDIR%%/OobsObject.html -%%DOCSDIR%%/OobsSMBConfig.html -%%DOCSDIR%%/OobsService.html -%%DOCSDIR%%/OobsServicesConfig.html -%%DOCSDIR%%/OobsSession.html -%%DOCSDIR%%/OobsShare.html -%%DOCSDIR%%/OobsShareNFS.html -%%DOCSDIR%%/OobsShareSMB.html -%%DOCSDIR%%/OobsStaticHost.html -%%DOCSDIR%%/OobsTimeConfig.html -%%DOCSDIR%%/OobsUser.html -%%DOCSDIR%%/OobsUsersConfig.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/ch03.html -%%DOCSDIR%%/ch04.html -%%DOCSDIR%%/ch05.html -%%DOCSDIR%%/ch06.html -%%DOCSDIR%%/ch07.html -%%DOCSDIR%%/ch08.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/liboobs-OobsHostsConfig.html -%%DOCSDIR%%/liboobs-OobsIfaceISDN.html -%%DOCSDIR%%/liboobs-OobsIfaceModem.html -%%DOCSDIR%%/liboobs-OobsNTPServer.html -%%DOCSDIR%%/liboobs.devhelp -%%DOCSDIR%%/liboobs.devhelp2 -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png -@dirrm %%DOCSDIR%% @dirrm include/liboobs-1.0/oobs @dirrm include/liboobs-1.0 diff --git a/devel/libpthread-stubs/files/patch-Makefile.in b/devel/libpthread-stubs/files/patch-Makefile.in index 4bfc2a9a8..0aed1ffa5 100644 --- a/devel/libpthread-stubs/files/patch-Makefile.in +++ b/devel/libpthread-stubs/files/patch-Makefile.in @@ -1,5 +1,5 @@ -$FreeBSD: ports/devel/libpthread-stubs/files/patch-Makefile.in,v 1.2 2009/11/05 20:16:01 miwi Exp $ +$FreeBSD$ --- Makefile.in.orig +++ Makefile.in diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile index 17453d609..c7b34c9c3 100644 --- a/ftp/gwget/Makefile +++ b/ftp/gwget/Makefile @@ -2,7 +2,7 @@ # Date created: 1 November 2004 # Whom: Radek Kozlowski <radek@raadradd.com> # -# $FreeBSD: ports/ftp/gwget/Makefile,v 1.22 2009/10/04 00:06:51 avl Exp $ +# $FreeBSD$ # PORTNAME= gwget diff --git a/graphics/gambas2-gb-pdf/Makefile b/graphics/gambas2-gb-pdf/Makefile index 57b3efa31..1626b91aa 100644 --- a/graphics/gambas2-gb-pdf/Makefile +++ b/graphics/gambas2-gb-pdf/Makefile @@ -2,7 +2,7 @@ # Date created: 2009-05-02 # Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> # -# $FreeBSD: ports/graphics/gambas2-gb-pdf/Makefile,v 1.1 2009/05/09 01:29:08 acm Exp $ +# $FreeBSD$ # PORTREVISION= 1 diff --git a/graphics/gambas2-gb-pdf/pkg-plist b/graphics/gambas2-gb-pdf/pkg-plist index da751be8c..8ecfcfd5d 100644 --- a/graphics/gambas2-gb-pdf/pkg-plist +++ b/graphics/gambas2-gb-pdf/pkg-plist @@ -1,4 +1,4 @@ -@comment $FreeBSD: ports/graphics/gambas2-gb-pdf/pkg-plist,v 1.1 2009/05/09 01:29:08 acm Exp $ +@comment $FreeBSD$ lib/gambas2/gb.pdf.component lib/gambas2/gb.pdf.so.0 lib/gambas2/gb.pdf.so diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index a270a9311..829239635 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -2,7 +2,7 @@ # Date created: 17 Nov 2003 # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # -# $FreeBSD: ports/graphics/inkscape/Makefile,v 1.51 2009/07/31 13:52:19 dinoex Exp $ +# $FreeBSD$ # PORTNAME= inkscape diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 100e3f8ff..c305f4733 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.126 2009/09/07 10:19:45 kwm Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.127 2009/09/26 13:41:59 marcus Exp $ # PORTNAME= librsvg2 @@ -49,7 +49,6 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" on USE_GECKO= libxul seamonkey USE_WEBPLUGINS= gecko19 WEBPLUGINS_FILES=libmozsvgdec.so -.include "${PORTSDIR}/www/firefox/Makefile.webplugins" CONFIGURE_ENV+= MOZILLA_CONFIG=no CONFIGURE_ARGS+=--enable-mozilla-plugin=yes diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile index 6799c9079..1e0a5dcb4 100644 --- a/graphics/nip2/Makefile +++ b/graphics/nip2/Makefile @@ -2,7 +2,7 @@ # Date created: 19 December 2003 # Whom: Lev Serebryakov <lev@FreeBSD.org> # -# $FreeBSD: ports/graphics/nip2/Makefile,v 1.21 2009/07/31 13:52:29 dinoex Exp $ +# $FreeBSD$ # PORTNAME= nip2 diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile index 69af8df8a..ee3a3e940 100644 --- a/graphics/poppler-data/Makefile +++ b/graphics/poppler-data/Makefile @@ -2,7 +2,7 @@ # Date created: 2006-09-30 # Whom: Michael Johnson <ahze@FreeBSD.org> # -# $FreeBSD: ports/graphics/poppler-data/Makefile,v 1.3 2008/11/22 17:28:35 ahze Exp $ +# $FreeBSD$ # PORTNAME= poppler-data diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile index 7c6953eac..fe9ae9273 100644 --- a/mail/evolution-sharp/Makefile +++ b/mail/evolution-sharp/Makefile @@ -2,8 +2,8 @@ # Date created: 20041012 # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # -# $FreeBSD: ports/mail/evolution-sharp/Makefile,v 1.21 2009/07/31 13:53:21 dinoex Exp $ -# $Id: Makefile,v 1.14 2009-09-28 12:13:48 kwm Exp $ +# $FreeBSD$ +# $Id: Makefile,v 1.15 2009-11-28 05:59:01 mezz Exp $ # PORTNAME= evolution-sharp diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index dc97c9a48..519dbd22d 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -2,8 +2,8 @@ # Date created: 31 May 2002 # Whom: olgeni@FreeBSD.org # -# $FreeBSD: ports/misc/shared-mime-info/Makefile,v 1.56 2009/05/11 12:23:00 mezz Exp $ -# $MCom: ports/misc/shared-mime-info/Makefile,v 1.13 2008/02/01 04:17:52 mezz Exp $ +# $FreeBSD$ +# $MCom: ports/misc/shared-mime-info/Makefile,v 1.15 2009/10/10 15:52:41 marcus Exp $ # PORTNAME= shared-mime-info diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile index 2ddd6e7c3..e47c37ec1 100644 --- a/misc/uf-view/Makefile +++ b/misc/uf-view/Makefile @@ -2,7 +2,7 @@ # Date created: 30 May 2001 # Whom: Jonathan McGee <mcgee@wam.umd.edu> # -# $FreeBSD: ports/misc/uf-view/Makefile,v 1.24 2009/07/31 13:54:20 dinoex Exp $ +# $FreeBSD$ # PORTNAME= uf-view diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index c13372698..af2fafc20 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -2,8 +2,8 @@ # Date created: January 24, 1998 # Whom: jseger@FreeBSD.org # -# $FreeBSD: ports/print/freetype2/Makefile,v 1.87 2009/08/22 00:34:34 amdmi3 Exp $ -# $MCom: ports/print/freetype2/Makefile,v 1.16 2009/04/09 03:24:09 mezz Exp $ +# $FreeBSD$ +# $MCom: ports/print/freetype2/Makefile,v 1.18 2009/10/24 06:09:00 marcus Exp $ # PORTNAME= freetype2 diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile index 89ba7a4ee..5fa9d2ba9 100644 --- a/security/tuntun/Makefile +++ b/security/tuntun/Makefile @@ -2,7 +2,7 @@ # Date created: 2008-09-16 # Whom: Anderson S. Ferreira <anderson@cnpm.embrapa.br> # -# $FreeBSD: ports/security/tuntun/Makefile,v 1.3 2009/07/31 13:55:46 dinoex Exp $ +# $FreeBSD$ # PORTNAME= tuntun diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile index c55d4a78a..c31cc6b1a 100644 --- a/sysutils/eiciel/Makefile +++ b/sysutils/eiciel/Makefile @@ -2,7 +2,7 @@ # Date created: July 20, 2005 # Whom: andreas@syndrom23.de # -# $FreeBSD: ports/sysutils/eiciel/Makefile,v 1.21 2009/08/02 19:35:34 mezz Exp $ +# $FreeBSD$ # PORTNAME= eiciel diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index fe27b11ab..8f3503d2a 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.70 2009/10/24 06:34:26 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.71 2009/11/22 01:04:36 marcus Exp $ # PORTNAME= hal @@ -50,6 +50,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ #HALVERSION= 0.5.10 #SNAPVERSION= 20080218 +USERS= haldaemon +GROUPS= haldaemon + USE_RC_SUBR= hald USE_GNOME_SUBR= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in index 59505fc30..253eef1f0 100644 --- a/sysutils/hal/files/pkg-install.in +++ b/sysutils/hal/files/pkg-install.in @@ -4,33 +4,6 @@ case $2 in POST-INSTALL) USER=haldaemon GROUP=${USER} - UID=560 - GID=${UID} - PW=/usr/sbin/pw - - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "HAL Daemon User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald /usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile index 576a49161..218998b6c 100644 --- a/textproc/gnome-translate/Makefile +++ b/textproc/gnome-translate/Makefile @@ -2,12 +2,12 @@ # Date created: 28 Jan 2005 # Whom: Jean-Yves Lefort <jylefort@brutele.be> # -# $FreeBSD: ports/textproc/gnome-translate/Makefile,v 1.14 2009/07/31 13:56:11 dinoex Exp $ +# $FreeBSD$ # PORTNAME= gnome-translate PORTVERSION= 0.99 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= libtranslate @@ -20,7 +20,7 @@ LIB_DEPENDS= translate:${PORTSDIR}/textproc/libtranslate INSTALLS_OMF= yes INSTALLS_ICONS= yes GCONF_SCHEMAS= gnome-translate.schemas -USE_GNOME= gnomehack gnomeprefix eel2 intlhack +USE_GNOME= gnomehack gnomeprefix eel2 intlhack libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile index 6d8fd7bf1..b00c2a29c 100644 --- a/www/p5-Gtk2-WebKit/Makefile +++ b/www/p5-Gtk2-WebKit/Makefile @@ -7,7 +7,7 @@ PORTNAME= Gtk2-WebKit PORTVERSION= 0.04 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLORA diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile index ca9be29fb..b2bc8fcee 100644 --- a/x11-toolkits/gauche-gtk/Makefile +++ b/x11-toolkits/gauche-gtk/Makefile @@ -2,7 +2,7 @@ # Date created: 3 November 2002 # Whom: Kimura Fuyuki <fuyuki@hadaly.org> # -# $FreeBSD: ports/x11-toolkits/gauche-gtk/Makefile,v 1.35 2009/08/22 00:39:22 amdmi3 Exp $ +# $FreeBSD$ # PORTNAME= gauche diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile index 8fb0c29ef..4db485355 100644 --- a/x11-toolkits/gtkada-gcc/Makefile +++ b/x11-toolkits/gtkada-gcc/Makefile @@ -2,7 +2,7 @@ # Date Created: 24 Dec 2006 # Whom: Petr Holub <hopet@ics.muni.cz> # -# $FreeBSD: ports/x11-toolkits/gtkada-gcc/Makefile,v 1.8 2009/08/22 00:39:22 amdmi3 Exp $ +# $FreeBSD$ # PORTNAME= gtkada diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile index 3ea19e7b8..1c1e84cbd 100644 --- a/x11-toolkits/gtkmm24-reference/Makefile +++ b/x11-toolkits/gtkmm24-reference/Makefile @@ -2,7 +2,7 @@ # Date created: 09 May 2006 # Whom: Jean-Yves Lefort <jylefort@FreeBSD.org> # -# $FreeBSD: ports/x11-toolkits/gtkmm24-reference/Makefile,v 1.8 2009/07/31 13:57:26 dinoex Exp $ +# $FreeBSD$ # PORTREVISION= 5 diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 54c8f0850..f45997ec3 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.53 2009/09/17 22:32:50 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.54 2009/09/26 12:46:35 marcus Exp $ # PORTNAME= gnome-extras @@ -43,7 +43,6 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-extras .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" .if defined(GECKO) && ${GECKO:Mlibxul}!="" CONFIGURE_ARGS+= --with-gtkmozembed=mozilla diff --git a/x11-toolkits/slgtk/Makefile b/x11-toolkits/slgtk/Makefile index 2a1dd21ea..7de23dcfd 100644 --- a/x11-toolkits/slgtk/Makefile +++ b/x11-toolkits/slgtk/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 USE_GNOME= gtk20 GNU_CONFIGURE= yes CONFIGURE_ARGS= LDFLAGS=-lncurses +MAKE_JOBS_UNSAFE= yes MAN1= imdisplay.1 diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index d556143c6..2a09fdd27 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -2,7 +2,7 @@ # Date created: September 18, 1999 # Whom: nectar@FreeBSD.ORG # -# $FreeBSD: ports/x11-toolkits/wxgtk24/Makefile,v 1.62 2009/08/22 00:39:31 amdmi3 Exp $ +# $FreeBSD$ # PORTNAME= wx diff --git a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h index 57f49cb17..f0fd474d8 100644 --- a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h +++ b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h @@ -1,5 +1,5 @@ -$FreeBSD: ports/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h,v 1.4 2006/10/14 08:52:28 marcus Exp $ +$FreeBSD$ --- include/wx/wxchar.h.orig Sun Sep 15 21:19:48 2002 +++ include/wx/wxchar.h Sat Oct 26 18:06:12 2002 diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index ed03d51ac..068952057 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -2,7 +2,7 @@ # Date created: Dec 20 2006 # Whom: Florent Thoumie <flz@FreeBSD.org> # -# $FreeBSD: ports/x11-wm/compiz/Makefile,v 1.18 2009/08/02 19:36:31 mezz Exp $ +# $FreeBSD$ # PORTNAME= compiz diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist index fd214a72d..0a0e7cf0e 100644 --- a/x11-wm/compiz/pkg-plist +++ b/x11-wm/compiz/pkg-plist @@ -1,4 +1,4 @@ -@comment $FreeBSD: ports/x11-wm/compiz/pkg-plist,v 1.6 2009/04/08 06:55:27 rnoland Exp $ +@comment $FreeBSD$ bin/compiz bin/compiz-manager %%GTK%%bin/gtk-window-decorator diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 553399e2b..2a59be1b3 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.162 2009/10/25 00:14:31 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.163 2009/11/23 18:16:00 kwm Exp $ # PORTNAME= gdm @@ -26,6 +26,9 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ gnome-session:${PORTSDIR}/x11/gnome-session +USERS= gdm +GROUPS= gdm + USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index dffd607f2..97ae6b483 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -4,40 +4,10 @@ case $2 in POST-INSTALL) USER=gdm GROUP=${USER} - UID=92 - GID=${UID} - PW=/usr/sbin/pw CHMOD=/bin/chmod CHOWN=/usr/sbin/chown MKDIR=/bin/mkdir - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - uhome=`${PW} user show ${USER} | awk -F: '{print $9}'` - if [ x"${uhome}" = x"/nonexistent" -o x"${uhome}" = x"/var/gdm" ]; then - ${PW} usermod ${USER} -d "${PKG_PREFIX}/etc/gdm/home" - fi - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "${PKG_PREFIX}/etc/gdm/home" -s /sbin/nologin -c "GNOME Display Manager" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi ${MKDIR} -p /var/gdm ${MKDIR} -p /var/log/gdm ${CHMOD} 0755 /var/log/gdm |