diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/emacs20/Makefile | 4 | ||||
| -rw-r--r-- | editors/gobby/Makefile | 2 | ||||
| -rw-r--r-- | editors/morla/Makefile | 1 | ||||
| -rw-r--r-- | editors/nano/Makefile | 3 | ||||
| -rw-r--r-- | editors/poedit/Makefile | 1 | ||||
| -rw-r--r-- | editors/psgml/Makefile | 3 | ||||
| -rw-r--r-- | editors/xemacs-devel-mule/Makefile | 17 | ||||
| -rw-r--r-- | editors/xemacs-devel-mule/pkg-plist | 42 | ||||
| -rw-r--r-- | editors/xemacs-devel/Makefile | 18 | ||||
| -rw-r--r-- | editors/xemacs-devel/pkg-plist | 42 | ||||
| -rw-r--r-- | editors/xemacs/Makefile | 21 | ||||
| -rw-r--r-- | editors/xemacs/pkg-plist | 37 | ||||
| -rw-r--r-- | editors/xemacs21-mule/Makefile | 3 | ||||
| -rw-r--r-- | editors/zile/Makefile | 2 |
15 files changed, 64 insertions, 134 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 7404a21189c2..bb970bfe7687 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -55,8 +55,6 @@ CONFIGURE_ARGS= --with-gtk CONFIGURE_ARGS+= --without-xim .endif -CONFIGURE_ARGS+= --infodir='$${prefix}/info' --mandir='$${prefix}/man' - MAN1= ctags.1 emacs.1 emacsclient.1 etags.1 PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 361c8b45e445..bf05fe50988b 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -37,8 +37,8 @@ USE_XLIB= yes USE_XORG= xbitmaps .endif CONFIGURE_ARGS+= --with-line-space \ - --bindir='$${archlibdir}' \ - --infodir='$${datadir}/emacs/$${version}/info' + --bindir='$${archlibdir}' +INFO_PATH= ${DATADIR_REL}/${EMACS_VER}/info MAKE_ARGS+= manext=20.1 MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile index 9fc88c5ef932..8f84be7d4dfa 100644 --- a/editors/gobby/Makefile +++ b/editors/gobby/Makefile @@ -23,8 +23,6 @@ USE_XLIB= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig gtksourceview -CONFIGURE_ARGS= "--mandir=${PREFIX}/man" - PLIST_FILES= bin/gobby share/pixmaps/gobby.png \ share/pixmaps/gobby/userlist.png \ share/pixmaps/gobby/doclist.png \ diff --git a/editors/morla/Makefile b/editors/morla/Makefile index 3571e2641e11..2ce95c206b6c 100644 --- a/editors/morla/Makefile +++ b/editors/morla/Makefile @@ -23,7 +23,6 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I/${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man USE_GETTEXT= yes USE_GNOME= libgtkhtml libxslt diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 632a2b6603fe..5d03670cf991 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -15,8 +15,7 @@ MAINTAINER= naddy@FreeBSD.org COMMENT= Nano's ANOther editor, an enhanced free Pico clone GNU_CONFIGURE= yes -CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} --mandir=${PREFIX}/man \ - --enable-all +CONFIGURE_ARGS= --enable-all CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 406eeb7e4237..0939ac092951 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -29,7 +29,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ WXRC="${WXRC_CMD}" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man INSTALLS_ICONS= yes MAN1= poedit.1 diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile index 931b864b9586..73e15e911f4f 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -49,8 +49,7 @@ PLIST_SUB+= XEMACS="@comment " \ .if defined(EMACS_PORT_NAME) PSGML_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/psgml GNU_CONFIGURE= YES -CONFIGURE_ARGS= --lispdir=${PSGML_LISPDIR} \ - --infodir=${PREFIX}/${INFO_PATH} +CONFIGURE_ARGS= --lispdir=${PSGML_LISPDIR} CONFIGURE_ENV= EMACS=${EMACS_CMD} .else .BEGIN: diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index c9b5848176e1..85be090b9de2 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -7,6 +7,7 @@ PORTNAME= xemacs-devel-mule PORTVERSION= ${XEMACS_VER:S/-/./} +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -81,6 +82,22 @@ DESCR= ${PKGDIR}/pkg-descr.ja .else MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +INFO= xemacs-${XEMACS_VER}/beta \ + xemacs-${XEMACS_VER}/cl \ + xemacs-${XEMACS_VER}/custom \ + xemacs-${XEMACS_VER}/emodules \ + xemacs-${XEMACS_VER}/external-widget \ + xemacs-${XEMACS_VER}/info \ + xemacs-${XEMACS_VER}/internals \ + xemacs-${XEMACS_VER}/lispref \ + xemacs-${XEMACS_VER}/new-users-guide \ + xemacs-${XEMACS_VER}/standards \ + xemacs-${XEMACS_VER}/term \ + xemacs-${XEMACS_VER}/termcap \ + xemacs-${XEMACS_VER}/texinfo \ + xemacs-${XEMACS_VER}/widget \ + xemacs-${XEMACS_VER}/xemacs-faq \ + xemacs-${XEMACS_VER}/xemacs .endif # Debugging. diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist index 20d86c68b3e0..44ac3e68a73e 100644 --- a/editors/xemacs-devel-mule/pkg-plist +++ b/editors/xemacs-devel-mule/pkg-plist @@ -9,6 +9,7 @@ bin/ootags bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% +info/xemacs-%%XEMACS_VER%%/dir @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp lib/xemacs-%%XEMACS_VER%%/etc/COPYING lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog @@ -863,46 +864,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow -lib/xemacs-%%XEMACS_VER%%/info/beta.info -lib/xemacs-%%XEMACS_VER%%/info/cl.info -lib/xemacs-%%XEMACS_VER%%/info/custom.info -lib/xemacs-%%XEMACS_VER%%/info/dir -lib/xemacs-%%XEMACS_VER%%/info/emodules.info -lib/xemacs-%%XEMACS_VER%%/info/external-widget.info -lib/xemacs-%%XEMACS_VER%%/info/info.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info-1 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-2 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-3 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-4 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info -lib/xemacs-%%XEMACS_VER%%/info/standards.info -lib/xemacs-%%XEMACS_VER%%/info/term.info -lib/xemacs-%%XEMACS_VER%%/info/termcap.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2 -lib/xemacs-%%XEMACS_VER%%/info/widget.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK lib/xemacs-%%XEMACS_VER%%/lisp/README @@ -1460,7 +1421,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp -@dirrm lib/xemacs-%%XEMACS_VER%%/info @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 249af927ffeb..c858c33564fc 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-devel PORTVERSION= ${XEMACS_VER:S/-/./} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} @@ -60,6 +60,22 @@ CONFIGURE_ARGS?=--enable-clash-detection \ MAKE_ARGS= prefix=${PREFIX} MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +INFO= xemacs-${XEMACS_VER}/beta \ + xemacs-${XEMACS_VER}/cl \ + xemacs-${XEMACS_VER}/custom \ + xemacs-${XEMACS_VER}/emodules \ + xemacs-${XEMACS_VER}/external-widget \ + xemacs-${XEMACS_VER}/info \ + xemacs-${XEMACS_VER}/internals \ + xemacs-${XEMACS_VER}/lispref \ + xemacs-${XEMACS_VER}/new-users-guide \ + xemacs-${XEMACS_VER}/standards \ + xemacs-${XEMACS_VER}/term \ + xemacs-${XEMACS_VER}/termcap \ + xemacs-${XEMACS_VER}/texinfo \ + xemacs-${XEMACS_VER}/widget \ + xemacs-${XEMACS_VER}/xemacs-faq \ + xemacs-${XEMACS_VER}/xemacs ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist index 4bae4d0d6a60..03814df23921 100644 --- a/editors/xemacs-devel/pkg-plist +++ b/editors/xemacs-devel/pkg-plist @@ -9,6 +9,7 @@ bin/ootags bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% +info/xemacs-%%XEMACS_VER%%/dir @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp lib/xemacs-%%XEMACS_VER%%/etc/COPYING lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog @@ -860,46 +861,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow -lib/xemacs-%%XEMACS_VER%%/info/beta.info -lib/xemacs-%%XEMACS_VER%%/info/cl.info -lib/xemacs-%%XEMACS_VER%%/info/custom.info -lib/xemacs-%%XEMACS_VER%%/info/dir -lib/xemacs-%%XEMACS_VER%%/info/emodules.info -lib/xemacs-%%XEMACS_VER%%/info/external-widget.info -lib/xemacs-%%XEMACS_VER%%/info/info.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info-1 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-2 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-3 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-4 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info -lib/xemacs-%%XEMACS_VER%%/info/standards.info -lib/xemacs-%%XEMACS_VER%%/info/term.info -lib/xemacs-%%XEMACS_VER%%/info/termcap.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2 -lib/xemacs-%%XEMACS_VER%%/info/widget.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK lib/xemacs-%%XEMACS_VER%%/lisp/README @@ -1457,7 +1418,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp -@dirrm lib/xemacs-%%XEMACS_VER%%/info @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index b46c735d88af..9932bb29558f 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs PORTVERSION= ${XEMACS_VER} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -42,6 +42,21 @@ CONFIGURE_ARGS?=--with-clash-detection \ MAKE_ARGS= prefix=${PREFIX} MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 +INFO= xemacs-${XEMACS_VER}/cl \ + xemacs-${XEMACS_VER}/custom \ + xemacs-${XEMACS_VER}/emodules \ + xemacs-${XEMACS_VER}/external-widget \ + xemacs-${XEMACS_VER}/info \ + xemacs-${XEMACS_VER}/internals \ + xemacs-${XEMACS_VER}/lispref \ + xemacs-${XEMACS_VER}/new-users-guide \ + xemacs-${XEMACS_VER}/standards \ + xemacs-${XEMACS_VER}/term \ + xemacs-${XEMACS_VER}/termcap \ + xemacs-${XEMACS_VER}/texinfo \ + xemacs-${XEMACS_VER}/widget \ + xemacs-${XEMACS_VER}/xemacs-faq \ + xemacs-${XEMACS_VER}/xemacs ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \ @@ -125,6 +140,10 @@ pre-patch: @${ECHO_MSG} "want to use X11." .endif +post-patch:: + @${REINPLACE_CMD} -e 's,@mandir@,@mandir@/man1,' \ + ${WRKSRC}/Makefile.in.in + # Drop faces (libcompface) and offix (libDnd) if building package, # autodetect otherwise .if defined(PACKAGE_BUILDING) diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist index 0e98cf29579d..8cdc2900abb2 100644 --- a/editors/xemacs/pkg-plist +++ b/editors/xemacs/pkg-plist @@ -10,6 +10,7 @@ bin/rcs-checkin bin/xemacs bin/xemacs-%%XEMACS_VER%% %%PDUMP%%bin/xemacs-%%XEMACS_VER%%.dmp +info/xemacs-%%XEMACS_VER%%/dir @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp lib/xemacs-%%XEMACS_VER%%/etc/BETA lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS @@ -756,41 +757,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow -lib/xemacs-%%XEMACS_VER%%/info/cl.info -lib/xemacs-%%XEMACS_VER%%/info/custom.info -lib/xemacs-%%XEMACS_VER%%/info/dir -lib/xemacs-%%XEMACS_VER%%/info/emodules.info -lib/xemacs-%%XEMACS_VER%%/info/external-widget.info -lib/xemacs-%%XEMACS_VER%%/info/info.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info -lib/xemacs-%%XEMACS_VER%%/info/internals.info-1 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info -lib/xemacs-%%XEMACS_VER%%/info/standards.info -lib/xemacs-%%XEMACS_VER%%/info/term.info -lib/xemacs-%%XEMACS_VER%%/info/termcap.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2 -lib/xemacs-%%XEMACS_VER%%/info/widget.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK @@ -1244,7 +1210,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule @dirrm lib/xemacs-%%XEMACS_VER%%/lisp -@dirrm lib/xemacs-%%XEMACS_VER%%/info @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 9032a9fad45d..70929fb4c6c6 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -75,6 +75,7 @@ CONFIGURE_ARGS= --with-x11 \ ${WITH_XIM} \ ${WITH_MENUBARS} ${WITH_SCROLLBARS} \ ${WITH_DIALOGS} ${WITH_WIDGETS} +INFO_PATH= lib/xemacs-${XEMACS_VER}/info MAKE_ARGS= prefix=${PREFIX} ALL_TARGET= all dist .if defined(PKGNAMEPREFIX) @@ -188,6 +189,8 @@ pre-configure:: @${SED} -e 's/\.1/&.gz/' ${WRKSRC}/${f} > ${WRKDIR}/tmp_zot @${MV} ${WRKDIR}/tmp_zot ${WRKSRC}/${f} .endfor + @${REINPLACE_CMD} -e 's/^mandir=@mandir@/mandir=@mandir@\/man1/' \ + ${WRKSRC}/Makefile.in.in pre-build: @${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \ diff --git a/editors/zile/Makefile b/editors/zile/Makefile index 7e230cffdc20..172f6d93e378 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -17,8 +17,6 @@ USE_GETOPT_LONG=yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LIBS="-lgnuregex" -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH} MAN1= zile.1 INFO= zile |