Attachment 44451 Details for Bug 68826 – xd.diff

[patch] xd.diff

xd.diff (text/plain), 3.51 KB, created by Pawel Worach on 2005-02-09 19:26:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Worach

Created: 2005-02-09 19:26:19 UTC

Size: 3.51 KB

patch

obsolete

>? 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 <bsd.port.pre.mk>
> 
>@@ -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;

Actions: View | Diff

Attachments on bug 68826: 44451