From 122c9d71f263c07fa20fd801c9e4433ebc597d73 Mon Sep 17 00:00:00 2001 From: minskim Date: Sun, 15 Feb 2004 02:58:46 +0000 Subject: Let xemacs and xemacs-nox11 share xemacs/Makefile.common. This synchornizes xemacs and xemace-nox11 again. --- editors/xemacs-nox11/Makefile | 106 ++------------------------------ editors/xemacs/Makefile | 134 +--------------------------------------- editors/xemacs/Makefile.common | 135 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 234 deletions(-) create mode 100644 editors/xemacs/Makefile.common diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index 0fb59a15417..f7a1abd80f9 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -1,119 +1,21 @@ -# $NetBSD: Makefile,v 1.10 2004/02/09 07:16:13 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/15 02:58:46 minskim Exp $ -DISTNAME= xemacs-21.4.12 -PKGNAME= xemacs-nox11-21.4.12 -PKGREVISION= 2 -CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.4/} -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES} +.include "../../editors/xemacs/Makefile.common" -MAINTAINER= magick@NetBSD.org -HOMEPAGE= http://www.xemacs.org/ -COMMENT= XEmacs text editor version 21 +PKGNAME= xemacs-nox11-21.4.15 -NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping +MAINTAINER= magick@NetBSD.org CONFLICTS= xemacs-[0-9]* -DIST_SUBDIR= xemacs PLIST_SRC= ${.CURDIR}/../xemacs/PLIST DISTINFO_FILE= ${.CURDIR}/../xemacs/distinfo PATCHDIR= ${.CURDIR}/../xemacs/patches -USE_BUILDLINK2= YES -#USE_X11= YES - -BUILD_DEFS+= USE_LDAP USE_XFACE XEMACS_USE_CANNA -DIST_SUBDIR= xemacs -EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PLIST_SUBST+= DISTNAME="${DISTNAME}" -MESSAGE_SUBST+= DISTNAME="${DISTNAME}" - -.include "../../mk/bsd.prefs.mk" - -.if defined(MANZ) -PLIST_SUBST+= ELSUFX='.gz' -.else -PLIST_SUBST+= ELSUFX='' -.endif - -#.if defined(USE_ATHENA) -# WITH_DIALOGS= --with-menubars=athena\ -# --with-scrollbars=athena\ -# --with-dialogs=athena\ -# --with-xim=xlib -#.else -# WITH_DIALOGS= --with-dialogs=motif -#.endif - -.if defined(USE_LDAP) && (${USE_LDAP} == "YES") -WITH_LDAP= --with-ldap -. include "../../databases/openldap/buildlink2.mk" -.else -WITH_LDAP= --without-ldap -.endif - -.if defined(USE_XFACE) && (${USE_XFACE} == "YES") -WITH_XFACE= --with-xface -. include "../../mail/faces/buildlink2.mk" -.else -WITH_XFACE= --without-xface -.endif - -.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES") -. include "../../inputmethod/canna-lib/buildlink2.mk" -WITH_CANNA= --with-canna -.else -WITH_CANNA= --without-canna -.endif - -.include "../../databases/gdbm/buildlink2.mk" -#.include "../../graphics/jpeg/buildlink2.mk" -#.include "../../graphics/png/buildlink2.mk" -#.include "../../graphics/tiff/buildlink2.mk" -#.include "../../graphics/xpm/buildlink2.mk" -#.if !defined(USE_ATHENA) -#.include "../../mk/motif.buildlink2.mk" -#.endif -.include "../../mk/ossaudio.buildlink2.mk" - -INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info - -HAS_CONFIGURE= YES -CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --with-clash-detection -CONFIGURE_ARGS+= --with-mule=yes -.if ${OPSYS} != "Linux" -CONFIGURE_ARGS+= --with-ncurses=no -.endif -CONFIGURE_ARGS+= --with-msw=no -CONFIGURE_ARGS+= ${WITH_DIALOGS} ${WITH_LDAP} ${WITH_XFACE} ${WITH_CANNA} -CONFIGURE_ARGS+= --infopath="${INFOPATH}" -CONFIGURE_ARGS+= --site-includes=${PREFIX}/include:${WRKDIR} -CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib CONFIGURE_ARGS+= --without-x11 # XXX -nox CONFIGURE_ARGS+= --without-jpeg # XXX -nox CONFIGURE_ARGS+= --without-png # XXX -nox CONFIGURE_ARGS+= --without-tiff # XXX -nox CONFIGURE_ARGS+= --without-xpm # XXX -nox -CFLAGS+= -Dunix - -post-extract: - for FILE in ${EXTRA_FILES}; do \ - ${GTAR} xzCf ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/$$FILE; \ - done - -post-patch: - @${RM} -f ${WRKSRC}/etc/ctags.1.orig - -post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${DISTNAME} - ${INSTALL_DATA_DIR} ${PREFIX}/lib/xemacs - @if [ "X${MANZ}" != X"" ]; then \ - ${WRKSRC}/lib-src/gzip-el.sh ${PREFIX}/lib/${DISTNAME}; \ - fi - .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 73211e0f27d..2868eb3e8e5 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,143 +1,13 @@ -# $NetBSD: Makefile,v 1.69 2004/02/09 07:54:58 minskim Exp $ +# $NetBSD: Makefile,v 1.70 2004/02/15 02:58:46 minskim Exp $ -DISTNAME= xemacs-21.4.15 -CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.4/} -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES} +.include "../../editors/xemacs/Makefile.common" MAINTAINER= uebayasi@NetBSD.org -HOMEPAGE= http://www.xemacs.org/ -COMMENT= XEmacs text editor version 21 -NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping - -USE_BUILDLINK2= YES USE_X11= YES -BUILD_DEFS+= USE_LDAP USE_XFACE XEMACS_USE_CANNA -DIST_SUBDIR= xemacs -EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PLIST_SUBST+= DISTNAME="${DISTNAME}" -MESSAGE_SUBST+= DISTNAME="${DISTNAME}" - -.include "../../mk/bsd.prefs.mk" - -# XXX GUI configuration is a mess... -# -#.if defined(USE_ATHENA) -#WITH_DIALOGS= \ -# --with-menubars=athena \ -# --with-scrollbars=athena \ -# --with-dialogs=athena \ -# --with-widgets=athena \ -# --with-athena=xaw \ -# --with-xim=xlib -#.include "../../mk/xaw.buildlink2.mk" -#.elif defined(USE_MOTIF) -#WITH_DIALOGS= \ -# --with-menubars=motif \ -# --with-scrollbars=motif \ -# --with-dialogs=motif \ -# --with-widgets=motif \ -# --with-xim=motif -#.include "../../mk/motif.buildlink2.mk" -#.elif defined(USE_GTK) -#WITH_DIALOGS= \ -# --with-gtk \ -# --with-menubars=yes \ -# --with-scrollbars=yes \ -# --with-dialogs=yes \ -# --with-widgets=yes \ -# --with-xim=yes -#.include "../../x11/gtk/buildlink2.mk" -#.else -# XXX Default is "lucid". Due to the output of `configure --help', Lucid -# widgets wrap Athena, so xaw.buildlink2.mk. -WITH_DIALOGS= \ - --with-toolbars=yes \ - --with-menubars=lucid \ - --with-scrollbars=lucid \ - --with-dialogs=lucid \ - --with-widgets=lucid \ - --with-athena=xaw \ - --with-xim=xlib -.include "../../mk/xaw.buildlink2.mk" -#.endif - -.if ${OPSYS} == "SunOS" -. if !exists(/usr/demo/SOUND/libaudio.a) && !exists(/usr/demo/SOUND/lib/libaudio.a) -CONFIGURE_ARGS+= --with_sound=none -. endif -.endif - -.if defined(USE_LDAP) && (${USE_LDAP} == "YES") -WITH_LDAP= --with-ldap -. include "../../databases/openldap/buildlink2.mk" -.else -WITH_LDAP= --without-ldap -.endif - -.if defined(USE_XFACE) && (${USE_XFACE} == "YES") -WITH_XFACE= --with-xface -. include "../../mail/faces/buildlink2.mk" -.else -WITH_XFACE= --without-xface -.endif - -.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES") -. include "../../inputmethod/canna-lib/buildlink2.mk" -WITH_CANNA= --with-canna -.else -WITH_CANNA= --without-canna -.endif - -.include "../../databases/gdbm/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" -.include "../../mk/ossaudio.buildlink2.mk" - -INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info - -HAS_CONFIGURE= YES -CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --with-clash-detection -CONFIGURE_ARGS+= --with-mule=yes -.if ${OPSYS} != "Linux" -CONFIGURE_ARGS+= --with-ncurses=no -.endif -CONFIGURE_ARGS+= --with-msw=no -CONFIGURE_ARGS+= ${WITH_DIALOGS} ${WITH_LDAP} ${WITH_XFACE} ${WITH_CANNA} -CONFIGURE_ARGS+= --infopath="${INFOPATH}" -CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${WRKDIR} -CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib -CONFIGURE_ARGS+= --site-runtime-libraries=${PREFIX}/lib - -CFLAGS+= -Dunix - -.if defined(MANZ) -PLIST_SUBST+= ELSUFX=.gz -.else -PLIST_SUBST+= ELSUFX= -.endif - -post-extract: - @for f in ${EXTRA_FILES}; do \ - ${GTAR} xzCf ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/$$f; \ - done - -post-patch: - @${RM} -f ${WRKSRC}/etc/ctags.1.orig - -post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${DISTNAME} - ${INSTALL_DATA_DIR} ${PREFIX}/lib/xemacs -.if defined(MANZ) - ${FIND} ${PREFIX}/lib/${DISTNAME} -name "*.el" -type f -print | \ - ${XARGS} ${GZIP_CMD} -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common new file mode 100644 index 00000000000..31182eeae78 --- /dev/null +++ b/editors/xemacs/Makefile.common @@ -0,0 +1,135 @@ +# $NetBSD: Makefile.common,v 1.1 2004/02/15 02:58:46 minskim Exp $ + +DISTNAME= xemacs-21.4.15 +CATEGORIES= editors +MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.4/} +DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES} + +HOMEPAGE= http://www.xemacs.org/ +COMMENT= XEmacs text editor version 21 + +NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping + +USE_BUILDLINK2= YES + +BUILD_DEFS+= USE_LDAP USE_XFACE XEMACS_USE_CANNA +DIST_SUBDIR= xemacs +EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PLIST_SUBST+= DISTNAME="${DISTNAME}" +MESSAGE_SUBST+= DISTNAME="${DISTNAME}" + +.include "../../mk/bsd.prefs.mk" + +# XXX GUI configuration is a mess... +# +#.if defined(USE_ATHENA) +#WITH_DIALOGS= \ +# --with-menubars=athena \ +# --with-scrollbars=athena \ +# --with-dialogs=athena \ +# --with-widgets=athena \ +# --with-athena=xaw \ +# --with-xim=xlib +#.include "../../mk/xaw.buildlink2.mk" +#.elif defined(USE_MOTIF) +#WITH_DIALOGS= \ +# --with-menubars=motif \ +# --with-scrollbars=motif \ +# --with-dialogs=motif \ +# --with-widgets=motif \ +# --with-xim=motif +#.include "../../mk/motif.buildlink2.mk" +#.elif defined(USE_GTK) +#WITH_DIALOGS= \ +# --with-gtk \ +# --with-menubars=yes \ +# --with-scrollbars=yes \ +# --with-dialogs=yes \ +# --with-widgets=yes \ +# --with-xim=yes +#.include "../../x11/gtk/buildlink2.mk" +#.else +# XXX Default is "lucid". Due to the output of `configure --help', Lucid +# widgets wrap Athena, so xaw.buildlink2.mk. +WITH_DIALOGS= \ + --with-toolbars=yes \ + --with-menubars=lucid \ + --with-scrollbars=lucid \ + --with-dialogs=lucid \ + --with-widgets=lucid \ + --with-athena=xaw \ + --with-xim=xlib +.include "../../mk/xaw.buildlink2.mk" +#.endif + +.if ${OPSYS} == "SunOS" +. if !exists(/usr/demo/SOUND/libaudio.a) && !exists(/usr/demo/SOUND/lib/libaudio.a) +CONFIGURE_ARGS+= --with_sound=none +. endif +.endif + +.if defined(USE_LDAP) && (${USE_LDAP} == "YES") +WITH_LDAP= --with-ldap +. include "../../databases/openldap/buildlink2.mk" +.else +WITH_LDAP= --without-ldap +.endif + +.if defined(USE_XFACE) && (${USE_XFACE} == "YES") +WITH_XFACE= --with-xface +. include "../../mail/faces/buildlink2.mk" +.else +WITH_XFACE= --without-xface +.endif + +.if defined(XEMACS_USE_CANNA) && (${XEMACS_USE_CANNA} == "YES") +. include "../../inputmethod/canna-lib/buildlink2.mk" +WITH_CANNA= --with-canna +.else +WITH_CANNA= --without-canna +.endif + +.if defined(MANZ) +PLIST_SUBST+= ELSUFX='.gz' +.else +PLIST_SUBST+= ELSUFX='' +.endif + +.include "../../databases/gdbm/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" + +INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info + +HAS_CONFIGURE= YES +CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --with-clash-detection +CONFIGURE_ARGS+= --with-mule=yes +.if ${OPSYS} != "Linux" +CONFIGURE_ARGS+= --with-ncurses=no +.endif +CONFIGURE_ARGS+= --with-msw=no +CONFIGURE_ARGS+= ${WITH_DIALOGS} ${WITH_LDAP} ${WITH_XFACE} ${WITH_CANNA} +CONFIGURE_ARGS+= --infopath="${INFOPATH}" +CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${WRKDIR} +CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --site-runtime-libraries=${PREFIX}/lib + +CFLAGS+= -Dunix + +post-extract: + @for f in ${EXTRA_FILES}; do \ + ${GTAR} xzCf ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/$$f; \ + done + +post-patch: + @${RM} -f ${WRKSRC}/etc/ctags.1.orig + +post-install: + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${DISTNAME} + ${INSTALL_DATA_DIR} ${PREFIX}/lib/xemacs +.if defined(MANZ) + ${FIND} ${PREFIX}/lib/${DISTNAME} -name "*.el" -type f -print | \ + ${XARGS} ${GZIP_CMD} +.endif -- cgit v1.2.3