aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/libidn/Makefile8
-rw-r--r--devel/libidn/pkg-plist6
-rw-r--r--dns/libidn/Makefile8
-rw-r--r--dns/libidn/pkg-plist6
4 files changed, 4 insertions, 24 deletions
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 13ed21e70c1b..18a2575a31eb 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -31,14 +31,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
INFO= libidn
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+= EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+= EMACS="@comment " EMACSDIR=""
-.endif
-
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/devel/libidn/pkg-plist b/devel/libidn/pkg-plist
index b12de9c0dc7d..51cd23630eb8 100644
--- a/devel/libidn/pkg-plist
+++ b/devel/libidn/pkg-plist
@@ -8,8 +8,8 @@ lib/libidn.a
lib/libidn.so
lib/libidn.so.13
libdata/pkgconfig/libidn.pc
-%%EMACS%%%%EMACSDIR%%/site-lisp/idna.el
-%%EMACS%%%%EMACSDIR%%/site-lisp/punycode.el
+share/emacs/site-lisp/idna.el
+share/emacs/site-lisp/punycode.el
%%NLS%%share/locale/da/LC_MESSAGES/libidn.mo
%%NLS%%share/locale/fr/LC_MESSAGES/libidn.mo
%%NLS%%share/locale/pl/LC_MESSAGES/libidn.mo
@@ -18,6 +18,4 @@ libdata/pkgconfig/libidn.pc
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/FAQ
@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
-%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp
-%%EMACS%%@dirrm %%EMACSDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index 13ed21e70c1b..18a2575a31eb 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -31,14 +31,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
INFO= libidn
-.if exists(${LOCALBASE}/bin/emacs)
-PLIST_SUB+= EMACS="" EMACSDIR=share/emacs
-.elif exists(${LOCALBASE}/bin/xemacs)
-PLIST_SUB+= EMACS="" EMACSDIR=lib/xemacs
-.else
-PLIST_SUB+= EMACS="@comment " EMACSDIR=""
-.endif
-
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/dns/libidn/pkg-plist b/dns/libidn/pkg-plist
index b12de9c0dc7d..51cd23630eb8 100644
--- a/dns/libidn/pkg-plist
+++ b/dns/libidn/pkg-plist
@@ -8,8 +8,8 @@ lib/libidn.a
lib/libidn.so
lib/libidn.so.13
libdata/pkgconfig/libidn.pc
-%%EMACS%%%%EMACSDIR%%/site-lisp/idna.el
-%%EMACS%%%%EMACSDIR%%/site-lisp/punycode.el
+share/emacs/site-lisp/idna.el
+share/emacs/site-lisp/punycode.el
%%NLS%%share/locale/da/LC_MESSAGES/libidn.mo
%%NLS%%share/locale/fr/LC_MESSAGES/libidn.mo
%%NLS%%share/locale/pl/LC_MESSAGES/libidn.mo
@@ -18,6 +18,4 @@ libdata/pkgconfig/libidn.pc
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/FAQ
@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
-%%EMACS%%@dirrm %%EMACSDIR%%/site-lisp
-%%EMACS%%@dirrm %%EMACSDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%