--0F1p//8PRICkK4MW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Sep 12, 2005 at 09:45:24AM +0200, Martin Husemann wrote:
> I tried converting the pkg Makefile to the new world order, but something
> must be wrong still (xemacs fails to find zenicb.el).

Pilot error - I lost some local init.el modification and got confused.

The attached patch (or Makefile, for easier reading) works fine for me - ok
to commit this?

Martin

--0F1p//8PRICkK4MW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/zenicb/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	28 Aug 2005 04:25:28 -0000	1.16
+++ Makefile	12 Sep 2005 09:10:05 -0000
@@ -15,21 +15,8 @@
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
 
-.if defined(USE_XEMACS)
-MAKEFLAGS+=		USE_XEMACS=${USE_XEMACS}
-.include "../../editors/xemacs/Makefile.pkg"
-.else
-.endif
-
 #PLIST_SUBST+=		ELISPDIR=${ELISPDIR}
 
-pre-configure:
-.if defined(USE_XEMACS)
-	@${ECHO} "You have chosen Xemacs configuration."
-.else
-	@${ECHO} "To install for Xemacs, set the environment variable USE_XEMACS."
-.endif
-
 do-build:
 
 do-install:

--0F1p//8PRICkK4MW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=Makefile

# $NetBSD: Makefile,v 1.16 2005/08/28 04:25:28 uebayasi Exp $

DISTNAME=		zenicb-19981202
PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
PKGREVISION=		2
CATEGORIES=		chat
MASTER_SITES=		${MASTER_SITE_LOCAL}

MAINTAINER=		tech-pkg@NetBSD.org
COMMENT=		ICB client for Emacs

NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL

.include "../../mk/emacs.mk"

EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215

#PLIST_SUBST+=		ELISPDIR=${ELISPDIR}

do-build:

do-install:
	@${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/zenicb
	@for file in ${WRKSRC}/src/*.el; do \
		j="${INSTALL_DATA} $$file ${EMACS_LISPPREFIX}/zenicb"; \
		${ECHO} $$j; $$j; \
	done

.include "../../mk/bsd.pkg.mk"

--0F1p//8PRICkK4MW--