Index: Mk/bsd.port.mk =================================================================== RCS file: /c/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.483 diff -u -r1.483 bsd.port.mk --- Mk/bsd.port.mk 24 Jan 2004 01:26:30 -0000 1.483 +++ Mk/bsd.port.mk 25 Jan 2004 21:21:30 -0000 @@ -1213,7 +1213,9 @@ .include "${PORTSDIR}/Mk/bsd.kde.mk" .endif +.if defined(WANT_GNOME) || defined(USE_GNOME) .include "${PORTSDIR}/Mk/bsd.gnome.mk" +.endif # defaults to 4.x for 5.0-CURRENT and 4.5-STABLE; and 3.3.6 for all other branches .if ${OSVERSION} > 500025 || ( ${OSVERSION} >= 450005 && ${OSVERSION} < 500000 ) @@ -1756,7 +1758,9 @@ .endif .endif +.if defined(WANT_GNOME) || defined(USE_GNOME) .include "${PORTSDIR}/Mk/bsd.gnome.mk" +.endif .if defined(USE_PYTHON) .include "${PORTSDIR}/Mk/bsd.python.mk" @@ -1950,7 +1954,9 @@ MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p # Determine whether or not we can use rootly owner/group functions. +.if !defined(UID) UID!= id -u +.endif .if ${UID} == 0 _BINOWNGRP= -o ${BINOWN} -g ${BINGRP} _SHROWNGRP= -o ${SHAREOWN} -g ${SHAREGRP} @@ -1998,7 +2004,7 @@ .for _CATEGORY in ${CATEGORIES} PKGCATEGORY?= ${_CATEGORY} .endfor -_PORTDIRNAME!= ${BASENAME} ${.CURDIR} +_PORTDIRNAME= ${.CURDIR:T} PORTDIRNAME?= ${_PORTDIRNAME} PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} .endif @@ -2024,7 +2030,10 @@ .endif # Does the pkg_create tool support conflict checking? +# XXX Slow? +.if !defined(PKGINSTALLVER) PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' +.endif .if ${PKGINSTALLVER} < 20030417 DISABLE_CONFLICTS= YES .endif @@ -4566,8 +4575,7 @@ .if !target(describe) describe: - @${ECHO_CMD} -n "`perl -e ' \ - print q{${PKGNAME}|${.CURDIR}|${PREFIX}|}`" + @${ECHO_CMD} -n '${PKGNAME}|${.CURDIR}|${PREFIX}|' .if defined(COMMENT) @${ECHO_CMD} -n ${COMMENT:Q} .else Index: Mk/bsd.port.subdir.mk =================================================================== RCS file: /c/ncvs/ports/Mk/bsd.port.subdir.mk,v retrieving revision 1.51 diff -u -r1.51 bsd.port.subdir.mk --- Mk/bsd.port.subdir.mk 20 Jan 2004 09:14:09 -0000 1.51 +++ Mk/bsd.port.subdir.mk 25 Jan 2004 23:14:50 -0000 @@ -65,6 +65,12 @@ .endif .endif +UID!= id -u +LOCALBASE?= /usr/local +PKG_INFO?= /usr/sbin/pkg_info +SED?= /usr/bin/sed +PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' + .if !defined(OPSYS) OPSYS!= /usr/bin/uname -s .endif @@ -301,7 +307,9 @@ OPSYS="${OPSYS:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ OSREL="${OSREL:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ OSVERSION="${OSVERSION:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ - PORTOBJFORMAT="${PORTOBJFORMAT:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" + PORTOBJFORMAT="${PORTOBJFORMAT:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ + UID="${UID:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" \ + PKGINSTALLVER="${PKGINSTALLVER:S/"/"'"'"/g:S/\$/\$\$/g:S/\\/\\\\/g}" .endif Index: comms/gnokii/Makefile =================================================================== RCS file: /c/ncvs/ports/comms/gnokii/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- comms/gnokii/Makefile 23 Jan 2004 18:11:45 -0000 1.28 +++ comms/gnokii/Makefile 25 Jan 2004 09:48:52 -0000 @@ -41,6 +41,8 @@ FIXPREFIX= Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \ common/cfgreader.c po/et.po po/sl.po +WANT_GNOME= yes + .include # If smsd is enabled check if MySQL or PostgreSQL are installed and Index: databases/clip/Makefile =================================================================== RCS file: /c/ncvs/ports/databases/clip/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- databases/clip/Makefile 23 Jan 2004 18:11:46 -0000 1.17 +++ databases/clip/Makefile 25 Jan 2004 09:49:42 -0000 @@ -17,6 +17,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= xBase and Clipper language compatible compiler +WANT_GNOME= yes + .include BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ Index: editors/openoffice-1.0/Makefile =================================================================== RCS file: /c/ncvs/ports/editors/openoffice-1.0/Makefile,v retrieving revision 1.185 diff -u -r1.185 Makefile --- editors/openoffice-1.0/Makefile 22 Jan 2004 11:05:53 -0000 1.185 +++ editors/openoffice-1.0/Makefile 25 Jan 2004 09:47:53 -0000 @@ -36,6 +36,8 @@ TCSH?= /bin/tcsh PASTE?= /usr/bin/paste +USE_GNOME= orbit gtk12 + .include INSTALLATION_BASEDIR= OpenOffice.org1.0 @@ -129,7 +131,6 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes -USE_GNOME= orbit gtk12 EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - Index: editors/openoffice-1.1/Makefile =================================================================== RCS file: /c/ncvs/ports/editors/openoffice-1.1/Makefile,v retrieving revision 1.113 diff -u -r1.113 Makefile --- editors/openoffice-1.1/Makefile 22 Jan 2004 11:05:54 -0000 1.113 +++ editors/openoffice-1.1/Makefile 25 Jan 2004 09:42:18 -0000 @@ -34,6 +34,8 @@ TCSH?= /bin/tcsh PASTE?= /usr/bin/paste +USE_GNOME= orbit gtk12 + .include BUILD_NR= 645 @@ -125,7 +127,6 @@ USE_BZIP2= yes USE_BISON= yes USE_GMAKE= yes -USE_GNOME= orbit gtk12 EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - Index: editors/vim/Makefile =================================================================== RCS file: /c/ncvs/ports/editors/vim/Makefile,v retrieving revision 1.242 diff -u -r1.242 Makefile --- editors/vim/Makefile 22 Jan 2004 11:05:54 -0000 1.242 +++ editors/vim/Makefile 25 Jan 2004 09:55:15 -0000 @@ -54,6 +54,8 @@ eview.1 gvimdiff.1 .endif +WANT_GNOME= yes + .include .if !defined(LITE) Index: irc/irssi/Makefile =================================================================== RCS file: /c/ncvs/ports/irc/irssi/Makefile,v retrieving revision 1.76 diff -u -r1.76 Makefile --- irc/irssi/Makefile 5 Jan 2004 18:47:53 -0000 1.76 +++ irc/irssi/Makefile 25 Jan 2004 09:45:56 -0000 @@ -17,6 +17,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes +WANT_GNOME= yes + MAN1= irssi.1 .include Index: korean/gdick/Makefile =================================================================== RCS file: /c/ncvs/ports/korean/gdick/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- korean/gdick/Makefile 13 Jan 2004 05:38:11 -0000 1.10 +++ korean/gdick/Makefile 25 Jan 2004 10:03:03 -0000 @@ -25,9 +25,9 @@ USE_BZIP2= yes PLIST_SUB= ${OPTPLIST_SUB} -.include - USE_GNOME= gnomehier + +.include post-patch: ${REINPLACE_CMD} -e \ Index: misc/mc/Makefile =================================================================== RCS file: /c/ncvs/ports/misc/mc/Makefile,v retrieving revision 1.90 diff -u -r1.90 Makefile --- misc/mc/Makefile 23 Jan 2004 18:12:13 -0000 1.90 +++ misc/mc/Makefile 25 Jan 2004 10:06:51 -0000 @@ -18,12 +18,12 @@ LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -.include - USE_GMAKE= yes USE_REINPLACE= yes USE_GNOME= glib20 GNU_CONFIGURE= yes + +.include .if !defined(WITHOUT_SAMBA) CONFIGURE_ARGS+=--with-samba --with-configdir=${LOCALBASE}/etc \ Index: net/nocatsplash/Makefile =================================================================== RCS file: /c/ncvs/ports/net/nocatsplash/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- net/nocatsplash/Makefile 3 Jan 2004 06:28:36 -0000 1.1 +++ net/nocatsplash/Makefile 25 Jan 2004 10:09:42 -0000 @@ -20,6 +20,8 @@ RUN_DEPENDS= \ ${LOCALBASE}/sbin/pfctl:${PORTSDIR}/security/pf +USE_GNOME= glib12 + .include .if ${OSVERSION} < 500000 @@ -30,7 +32,6 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= glib12 CONFIGURE_ARGS+= --disable-dependency-tracking CONFIGURE_ARGS+= --disable-glibtest Index: x11-toolkits/wxgtk/Makefile =================================================================== RCS file: /c/ncvs/ports/x11-toolkits/wxgtk/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- x11-toolkits/wxgtk/Makefile 11 Nov 2003 14:25:53 -0000 1.37 +++ x11-toolkits/wxgtk/Makefile 25 Jan 2004 10:22:04 -0000 @@ -46,6 +46,8 @@ WXGTK_FLAVOR?= gtk +WANT_GNOME= yes + .if ${WXGTK_FLAVOR} != "gtk-common" RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common .endif