summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-10-14 08:54:54 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-10-14 08:54:54 +0000
commit29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch)
tree1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /editors
parent- Add goocanvas (diff)
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris)
Notes
Notes: svn path=/head/; revision=175261
Diffstat (limited to 'editors')
-rw-r--r--editors/abiword-plugins/Makefile4
-rw-r--r--editors/abiword/Makefile25
-rw-r--r--editors/abiword/files/patch-ar4
-rw-r--r--editors/abiword/pkg-plist1
-rw-r--r--editors/elvis/Makefile4
-rw-r--r--editors/leafpad/Makefile10
-rw-r--r--editors/leafpad/pkg-plist24
-rw-r--r--editors/mlview/Makefile6
-rw-r--r--editors/mlview/pkg-plist12
-rw-r--r--editors/poedit/Makefile4
-rw-r--r--editors/poedit/pkg-plist81
-rw-r--r--editors/winefish/Makefile5
-rw-r--r--editors/winefish/pkg-plist4
-rw-r--r--editors/xemacs/Makefile5
-rw-r--r--editors/xemacs/pkg-plist2
15 files changed, 120 insertions, 71 deletions
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 0c9dbf01d7a5..a798ee2228e3 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -3,11 +3,12 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/abiword-plugins/Makefile,v 1.16 2005/10/29 22:31:16 marcus Exp $
+# $MCom: ports/editors/abiword-plugins/Makefile,v 1.18 2006/07/18 12:45:43 ahze Exp $
#
PORTNAME= abiword
PORTVERSION= 2.4.5
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -24,7 +25,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20
WANT_GNOME= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 6572b9149b3f..37093dc65e0e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/abiword/Makefile,v 1.2 2005/10/29 22:31:16 marcus Exp $
+# $MCom: ports/editors/abiword/Makefile,v 1.6 2006/09/30 04:39:56 ahze Exp $
#
PORTNAME= abiword
PORTVERSION= 2.4.5
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -28,7 +29,7 @@ USE_GMAKE= yes
USE_ICONV= yes
USE_GNOME= libglade2 libxml2 libgnomeprintui desktopfileutils
WANT_GNOME= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xft \
--with-sys-wv \
@@ -72,8 +73,8 @@ PKGNAMESUFFIX:= -gnome
GNOME_ENABLED= yes
.endif
-.if defined(WITH_GUCHARMAP) || exists(${X11BASE}/libdata/pkgconfig/gucharmap.pc)
-LIB_DEPENDS+= gucharmap.4:${PORTSDIR}/deskutils/gucharmap
+.if defined(WITH_GUCHARMAP) || exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)
+LIB_DEPENDS+= gucharmap.5:${PORTSDIR}/deskutils/gucharmap
.else
CONFIGURE_ARGS+= --enable-cmap=no
.endif
@@ -99,19 +100,19 @@ post-patch:
post-install:
@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
- @${MKDIR} ${X11BASE}/share/applications
+ @${MKDIR} ${LOCALBASE}/share/applications
@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
- ${X11BASE}/share/applications/abiword.desktop
- @${MKDIR} ${X11BASE}/share/pixmaps
+ ${LOCALBASE}/share/applications/abiword.desktop
+ @${MKDIR} ${LOCALBASE}/share/pixmaps
@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
- ${X11BASE}/share/pixmaps/abiword_48.png
+ ${LOCALBASE}/share/pixmaps/abiword_48.png
.if defined(GNOME_ENABLED)
- @${MKDIR} ${X11BASE}/libdata/bonobo/servers
+ @${MKDIR} ${LOCALBASE}/libdata/bonobo/servers
@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
- ${X11BASE}/libdata/bonobo/servers/
- @${MKDIR} ${X11BASE}/share/gnome/gnome-2.0/ui
+ ${LOCALBASE}/libdata/bonobo/servers/
+ @${MKDIR} ${LOCALBASE}/share/gnome/gnome-2.0/ui
@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
- ${X11BASE}/share/gnome/gnome-2.0/ui/
+ ${LOCALBASE}/share/gnome/gnome-2.0/ui/
.endif
@-update-desktop-database
diff --git a/editors/abiword/files/patch-ar b/editors/abiword/files/patch-ar
index fb71cb0b6a26..7e5c85d3ddca 100644
--- a/editors/abiword/files/patch-ar
+++ b/editors/abiword/files/patch-ar
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-$MCom: ports/editors/abiword/files/patch-ar,v 1.2 2005/10/14 20:39:57 adamw Exp $
-
--- src/pkg/common/unix/scripts/install.sh.orig Sat Apr 7 10:59:52 2001
+++ src/pkg/common/unix/scripts/install.sh Wed Aug 8 13:31:57 2001
@@ -80,7 +80,7 @@
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 05f78dc8074d..cb5b016940f3 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -292,6 +292,7 @@ share/pixmaps/abiword_48.png
@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/glade
@dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord
@dirrm share/AbiSuite-%%ABIVERSION%%
+@dirrmtry share/pixmaps
@exec /bin/mkdir -p %D/lib/AbiWord-%%ABIVERSION%%/plugins
@dirrmtry lib/AbiWord-%%ABIVERSION%%/plugins
@dirrmtry lib/AbiWord-%%ABIVERSION%%
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 1ba2b0febb1f..73a2a3842f63 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= elvis
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
ftp://ftp.false.com/pub/elvis/ \
@@ -55,6 +56,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g ; \
s|-lipc|-lcurses|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|FT_FILE|ELVIS_FT_FILE|g' \
+ ${WRKSRC}/guix11/xdialog.c \
+ ${WRKSRC}/guix11/xdialog.h
do-install:
.for file in elvfmt elvis elvtags ref
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 20f0bb132cd7..043179cb3149 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= leafpad
PORTVERSION= 0.8.9
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,11 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= radek@raadradd.com
COMMENT= GTK+ based simple text editor
-USE_GNOME= gtk20 gnomehier desktopfileutils intlhack
+USE_GNOME= gtk20 desktopfileutils intlhack
USE_GCC= 3.4
USE_GETOPT_LONG= yes
USE_GETTEXT= YES
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
PTHREAD_LIB="${PTHREAD_LIBS}"
@@ -29,11 +30,6 @@ LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
-post-patch:
- @${REINPLACE_CMD} -e 's|/pixmaps|/gnome/pixmaps|; \
- s|/applications|/gnome/applications|' \
- ${WRKSRC}/Makefile.in ${WRKSRC}/src/Makefile.in
-
post-install:
.if !defined(NOPORTDOCS)
@${INSTALL} -d ${DOCSDIR}
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 26592edab164..58f26f0e52eb 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -1,7 +1,5 @@
bin/leafpad
-share/gnome/applications/leafpad.desktop
-share/gnome/pixmaps/leafpad.png
-share/gnome/pixmaps/leafpad.xpm
+share/applications/leafpad.desktop
share/locale/bg/LC_MESSAGES/leafpad.mo
share/locale/ca/LC_MESSAGES/leafpad.mo
share/locale/cs/LC_MESSAGES/leafpad.mo
@@ -24,5 +22,25 @@ share/locale/tr/LC_MESSAGES/leafpad.mo
share/locale/vi/LC_MESSAGES/leafpad.mo
share/locale/zh_CN/LC_MESSAGES/leafpad.mo
share/locale/zh_TW/LC_MESSAGES/leafpad.mo
+share/pixmaps/leafpad.png
+share/pixmaps/leafpad.xpm
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index fa8b35d94cfa..050cdf316d97 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mlview
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
@@ -29,12 +29,12 @@ GCONF_SCHEMAS= mlview.schemas
.include <bsd.port.pre.mk>
# Autodetect dbus
-.if exists (${LOCALBASE}/lib/libdbus-1.so.2)
+.if exists (${LOCALBASE}/lib/libdbus-1.so.3)
WITH_DBUS= yes
.endif
.if defined (WITH_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+="--enable-dbus=yes"
.endif
diff --git a/editors/mlview/pkg-plist b/editors/mlview/pkg-plist
index ccf12c2f10c0..ad017e8c3440 100644
--- a/editors/mlview/pkg-plist
+++ b/editors/mlview/pkg-plist
@@ -63,3 +63,15 @@ share/locale/sr/LC_MESSAGES/mlview.mo
share/locale/sr@Latn/LC_MESSAGES/mlview.mo
share/locale/sv/LC_MESSAGES/mlview.mo
@dirrm share/gnome/mlview
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index e56695575408..e60ee17f47cf 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,11 +4,12 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/editors/poedit/Makefile,v 1.2 2006/10/05 07:03:09 mezz Exp $
#
PORTNAME= poedit
PORTVERSION= 1.3.5
-PORTREVISION= 0
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +21,6 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \
wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-USE_X_PREFIX= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index 6e09cae593cc..47438b745b47 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -66,36 +66,6 @@ share/locale/uk/LC_MESSAGES/poedit.mo
share/locale/wa/LC_MESSAGES/poedit.mo
share/locale/zh_CN/LC_MESSAGES/poedit.mo
share/locale/zh_TW/LC_MESSAGES/poedit.mo
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/th/LC_MESSAGES
-@dirrmtry share/locale/th
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/sq_AL/LC_MESSAGES
-@dirrmtry share/locale/sq_AL
-@dirrmtry share/locale/ms/LC_MESSAGES
-@dirrmtry share/locale/ms
-@dirrmtry share/locale/mk/LC_MESSAGES
-@dirrmtry share/locale/mk
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/es_PR/LC_MESSAGES
-@dirrmtry share/locale/es_PR
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/am/LC_MESSAGES
-@dirrmtry share/locale/am
-@dirrmtry share/locale/af_ZA/LC_MESSAGES
-@dirrmtry share/locale/af_ZA
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
%%DATADIR%%/help/common/comment.gif
%%DATADIR%%/help/common/fileopen.gif
%%DATADIR%%/help/common/filesave.gif
@@ -168,3 +138,54 @@ share/locale/zh_TW/LC_MESSAGES/poedit.mo
@dirrm %%DATADIR%%/help/common
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sq_AL/LC_MESSAGES
+@dirrmtry share/locale/sq_AL
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/fa_IR/LC_MESSAGES
+@dirrmtry share/locale/fa_IR
+@dirrmtry share/locale/es_PR/LC_MESSAGES
+@dirrmtry share/locale/es_PR
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/af_ZA/LC_MESSAGES
+@dirrmtry share/locale/af_ZA
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 5e926f33ae57..8fa25287e357 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -7,6 +7,7 @@
PORTNAME= winefish
DISTVERSION= 1.3.3
+PORTREVISION= 2
CATEGORIES= editors print
MASTER_SITES= http://download.berlios.de/winefish/ \
http://nivi.interfree.it/distfiles/winefish/
@@ -29,8 +30,8 @@ MANCOMPRESSED= no
GNU_CONFIGURE= yes
USE_GCC= 3.3+
USE_GMAKE= yes
-USE_GNOME= libgnomeui desktopfileutils
-USE_X_PREFIX= yes
+USE_GNOME= libgnomeui desktopfileutils gnomehier
+USE_XLIB= yes
OPTIONS= CONTEXT "Enable ConTexT support (Experimental)" off \
VNTEX "Vietnamese TeX user" off \
diff --git a/editors/winefish/pkg-plist b/editors/winefish/pkg-plist
index ba524d63ccd1..15fded4286c6 100644
--- a/editors/winefish/pkg-plist
+++ b/editors/winefish/pkg-plist
@@ -5,12 +5,12 @@ share/gnome/applications/winefish.desktop
share/gnome/applications/winefish-project.desktop
share/gnome/mime-info/winefish.mime
share/gnome/mime-info/winefish.keys
+share/gnome/pixmaps/gnome-application-winefish-project.png
+share/gnome/pixmaps/winefish-icon.png
%%IFNLS%%share/locale/fr/LC_MESSAGES/winefish.mo
%%IFNLS%%share/locale/it/LC_MESSAGES/winefish.mo
%%IFNLS%%share/locale/vi/LC_MESSAGES/winefish.mo
share/mime/packages/winefish.xml
-share/pixmaps/gnome-application-winefish-project.png
-share/pixmaps/winefish-icon.png
%%PORTDOCS%%%%DOCSDIR%%/winefish.html
%%DATADIR%%/autotext.default
%%DATADIR%%/custom_menu.default
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index d83ae1ee0433..10b597e7eb1d 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xemacs
PORTVERSION= ${XEMACS_VER}
+PORTREVISION= 1
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -44,7 +45,7 @@ MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
ALL_TARGET= all dist
PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \
- LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+ LOCALBASE=${LOCALBASE}
.include <bsd.port.pre.mk>
@@ -137,7 +138,7 @@ post-install::
.endfor
.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \
- ${X11BASE}/share/gnome/applications
+ ${LOCALBASE}/share/gnome/applications
.endif
# For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
# Do what PLIST does for pkg_add.
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index c9828454f949..a8c8f860d964 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1269,9 +1269,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 19:09:48 +0000