From owner-freebsd-gnome@FreeBSD.ORG Fri Sep 30 06:53:20 2005 Return-Path: X-Original-To: freebsd-gnome@freebsd.org Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1B2E16A420 for ; Fri, 30 Sep 2005 06:53:20 +0000 (GMT) (envelope-from past@ebs.gr) Received: from fly.ebs.gr (fly.ebs.gr [62.103.84.177]) by mx1.FreeBSD.org (Postfix) with ESMTP id B625343D49 for ; Fri, 30 Sep 2005 06:53:16 +0000 (GMT) (envelope-from past@ebs.gr) Received: from ebs.gr (root@hal.ebs.gr [10.1.1.2]) by fly.ebs.gr (8.12.9p1/8.12.9) with ESMTP id j8U6rA9V069296; Fri, 30 Sep 2005 09:53:10 +0300 (EEST) (envelope-from past@ebs.gr) Received: from [10.1.1.158] (pc158.ebs.gr [10.1.1.158]) by ebs.gr (8.13.3/8.12.11) with ESMTP id j8U6rKRp008577; Fri, 30 Sep 2005 09:53:21 +0300 (EEST) (envelope-from past@ebs.gr) Message-ID: <433CE0CE.8070803@ebs.gr> Date: Fri, 30 Sep 2005 09:53:02 +0300 From: Panagiotis Astithas Organization: EBS Ltd. User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050830) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Jeremy Messenger References: <433BA139.3010701@ebs.gr> In-Reply-To: Content-Type: multipart/mixed; boundary="------------030506070505070109020902" Cc: freebsd-gnome@freebsd.org Subject: Re: About USE_GNOME=desktopfileutils X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2005 06:53:20 -0000 This is a multi-part message in MIME format. --------------030506070505070109020902 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Jeremy Messenger wrote: > On Thu, 29 Sep 2005 03:09:29 -0500, Panagiotis Astithas > wrote: > >> Should I expect anything more than glib20 to be pulled in from >> 'USE_GNOME=desktopfileutils'? > > > Yes, because desktop-file-utils depends on glib20. > >> I've checked the desktop-file-utils Makefile and the only Gnomish >> thing it looks to pull in is glib20. >> >> I tried running 'make all-depends-list' both with and without a >> 'USE_GNOME=desktopfileutils' line, but it produces the same output. > > > You need to show us your full Makefile. Well, it's nothing more than the attached patch to java/jdk15/Makefile. I suppose all-depends-list checks the installed packages for its output, that's why I always get the same. --------------030506070505070109020902 Content-Type: text/x-patch; name="jdk15.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="jdk15.patch" --- /usr/ports/java/jdk15/Makefile Tue Sep 20 23:00:08 2005 +++ jdk15/Makefile Wed Sep 28 23:57:17 2005 @@ -43,6 +43,7 @@ MAKE_ENV+= BROWSER=mozilla .endif USE_ICONV= yes +USE_GNOME= desktopfileutils MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include" .endif @@ -118,6 +119,9 @@ PLIST_FILES= jdk${JDK_VERSION}/jre/.systemPrefs/.system.lock \ jdk${JDK_VERSION}/jre/.systemPrefs/.systemRootModFile +.if !defined(WITHOUT_WEB) +PLIST_FILES+= share/applications/sun_java15.desktop +.endif PLIST_DIRS= jdk${JDK_VERSION}/jre/.systemPrefs .if (${ARCH} == amd64) @@ -284,9 +288,20 @@ ${MKDIR} ${PREFIX}/jdk${JDK_VERSION} cd ${JDKIMAGEDIR} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} +.if !defined(WITHOUT_WEB) + @${SED} -e 's#Exec=INSTALL_DIR/JRE_NAME_VERSION/bin/ControlPanel#Exec=${PREFIX}/jdk${JDK_VERSION}/bin/ControlPanel#' \ + -e 's#Icon=INSTALL_DIR/JRE_NAME_VERSION/plugin/desktop/sun_java.png#Icon=${PREFIX}/jdk${JDK_VERSION}/jre/plugin/desktop/sun_java.png#' \ + < ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop \ + > ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop.tmp + ${INSTALL_DATA} ${JDKIMAGEDIR}/jre/plugin/desktop/sun_java.desktop.tmp ${PREFIX}/share/applications/sun_java15.desktop +.endif @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${TMPPLIST} @${FIND} -s ${JDKIMAGEDIR} -not -type d | \ ${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${TMPPLIST} +.if !defined(WITHOUT_WEB) + @-update-desktop-database + @${ECHO_MSG} '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} +.endif .if defined(WITH_DEBUG) cd ${JDKIMAGEDIR_G} && ${FIND} . \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} @@ -296,6 +311,9 @@ @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \ ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${TMPPLIST} @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${TMPPLIST} +.if !defined(WITHOUT_WEB) + @${ECHO_MSG} '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} +.endif # XXX: put unregistervm into install script ? post-install: --------------030506070505070109020902--