From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 9 19:30:22 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B05E716A510 for ; Wed, 9 Feb 2005 19:30:22 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D4D943D31 for ; Wed, 9 Feb 2005 19:30:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j19JUMCI028615 for ; Wed, 9 Feb 2005 19:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j19JUMem028614; Wed, 9 Feb 2005 19:30:22 GMT (envelope-from gnats) Date: Wed, 9 Feb 2005 19:30:22 GMT Message-Id: <200502091930.j19JUMem028614@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Pawel Worach Subject: Re: ports/68826: various anomalies with xemacs port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Pawel Worach List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Feb 2005 19:30:22 -0000 The following reply was made to PR ports/68826; it has been noted by GNATS. From: Pawel Worach To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/68826: various anomalies with xemacs port Date: Wed, 09 Feb 2005 20:26:19 +0100 This is a multi-part message in MIME format. --------------020808090202090907090405 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Ok, here is a final diff - Make packages optional (WITHOUT_XEMACS_PACKAGES). - Remove dependency on mail/faces (it is not required for an base editor configuration and it pulls in gtk1 and what comes with that. - Integrate with the GNOME desktop if installed. Added files: files/xemacs.desktop.in Sending patch as attachment, hope this doesn't make Gnats upset. -- Pawel --------------020808090202090907090405 Content-Type: text/plain; name="xd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xd.diff" ? editors/xemacs/files/xemacs.desktop.in Index: editors/xemacs/Makefile =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/Makefile,v retrieving revision 1.85 diff -u -r1.85 Makefile --- editors/xemacs/Makefile 9 Feb 2005 13:19:57 -0000 1.85 +++ editors/xemacs/Makefile 9 Feb 2005 19:22:47 -0000 @@ -7,6 +7,7 @@ PORTNAME= xemacs PORTVERSION= ${XEMACS_VER} +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -20,9 +21,8 @@ XEMACS_VER= 21.4.17 XEMACS_ARCH= ${CONFIGURE_TARGET} -RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages - USE_BZIP2= yes +WANT_GNOME= yes STRIP= USE_AUTOCONF_VER=213 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd @@ -41,7 +41,8 @@ gnuserv.1 xemacs.1 ALL_TARGET= all dist -PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} +PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \ + LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} .include @@ -50,11 +51,13 @@ CONFIGURE_ARGS+= --with-system-malloc --pdump .endif +.if !defined(WITHOUT_XEMACS_PACKAGES) +RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages +.endif .if !defined(WITHOUT_X11) LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff.4:${PORTSDIR}/graphics/tiff \ - compface.1:${PORTSDIR}/mail/faces + tiff.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff USE_XLIB= yes USE_XPM= yes @@ -76,6 +79,17 @@ CONFIGURE_ARGS+= --without-x11 .endif +.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!="" +USE_GNOME+= gnomehier +PLIST_SUB+= DESKTOP="" +.else +PLIST_SUB+= DESKTOP="@comment " +.endif + +post-extract:: + @${SED} -e 's|@XEMACS_ICON@|${LOCALBASE}/lib/xemacs-${XEMACS_VER}/etc/xemacs-icon.xpm|' \ + <${FILESDIR}/xemacs.desktop.in >${WRKDIR}/xemacs.desktop + pre-patch: .if !defined(WITHOUT_X11) .if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC) @@ -109,6 +123,10 @@ .for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER} ${STRIP_CMD} ${PREFIX}/bin/${f} .endfor +.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!="" + ${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \ + ${X11BASE}/share/gnome/applications +.endif # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp. # Do what PLIST does for pkg_add. ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp Index: editors/xemacs/pkg-plist =================================================================== RCS file: /export/ctm/cvs/ports/editors/xemacs/pkg-plist,v retrieving revision 1.32 diff -u -r1.32 pkg-plist --- editors/xemacs/pkg-plist 25 Dec 2004 22:27:59 -0000 1.32 +++ editors/xemacs/pkg-plist 9 Feb 2005 19:22:47 -0000 @@ -1262,6 +1262,9 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc +%%DESKTOP%%@cwd %%X11BASE%% +%%DESKTOP%%share/gnome/applications/xemacs.desktop +%%DESKTOP%%@cwd %%LOCALBASE%% @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp --- /dev/null Wed Feb 9 20:22:00 2005 +++ editors/xemacs/files/xemacs.desktop.in Wed Feb 9 18:55:42 2005 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=XEmacs +Comment=XEmacs Text Editor +Exec=xemacs %F +Terminal=false +Type=Application +Icon=@XEMACS_ICON@ +Categories=Application;Utility;TextEditor; --------------020808090202090907090405--