CVS commit: pkgsrc/devel/flim

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Dec 12 11:42:49 UTC 2016

Modified Files:
        pkgsrc/devel/flim: Makefile

Log Message:
Fix the regexp that selects the files to install to work with XEmacs.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/flim/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/flim/Makefile
diff -u pkgsrc/devel/flim/Makefile:1.37 pkgsrc/devel/flim/Makefile:1.38
--- pkgsrc/devel/flim/Makefile:1.37     Wed Nov 25 12:49:46 2015
+++ pkgsrc/devel/flim/Makefile  Mon Dec 12 11:42:49 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2015/11/25 12:49:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2016/12/12 11:42:49 hauke Exp $
 
 DISTNAME=      flim-1.14.9
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/comp/emacsen/lisp/flim/flim-1.14/
 
@@ -45,7 +45,7 @@ post-build:
 
 do-install: plist
        cd ${WRKSRC};                                                   \
-       grep -v '^@' ${PLIST} | grep '/site-lisp/flim/' |               \
+       grep -v '^@' ${PLIST} | grep -E '/site-(|packages/)lisp/flim/' | \
        while read file; do                                             \
                file=$$( basename $$file );                             \
                ${INSTALL_DATA} $$file                                  \
@@ -60,6 +60,9 @@ post-install:
 
 .include "../../editors/emacs/modules.mk"
 
+.if (${EMACS_FLAVOR} != "xemacs")
 BUILDLINK_API_DEPENDS.apel+=   apel>=10.7
 .include "../../devel/apel/buildlink3.mk"
+.endif
+
 .include "../../mk/bsd.pkg.mk"