Date: Sun, 13 Nov 2016 13:21:08 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426049 - in head/editors/flim: . files Message-ID: <201611131321.uADDL8X7011025@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Sun Nov 13 13:21:08 2016 New Revision: 426049 URL: https://svnweb.freebsd.org/changeset/ports/426049 Log: - Simplify PLIST, BUILD_DEPENDS and RUN_DEPENDS selection. - Regenerate patches by 'make makepatch'. - Pet portlint. PR: 213182 Submitted by: Yasuhiro KIMURA <yasu@utahime.org> Deleted: head/editors/flim/pkg-plist.xemacs21-mule Modified: head/editors/flim/Makefile head/editors/flim/files/patch-FLIM-CFG head/editors/flim/files/patch-eword-encode.el head/editors/flim/files/patch-hex-util.el head/editors/flim/files/patch-hmac-def.el head/editors/flim/files/patch-md4.el head/editors/flim/files/patch-md5-el.el head/editors/flim/files/patch-mime-en.texi head/editors/flim/files/patch-mime-ja.texi head/editors/flim/files/patch-sha1-el.el Modified: head/editors/flim/Makefile ============================================================================== --- head/editors/flim/Makefile Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/Makefile Sun Nov 13 13:21:08 2016 (r426049) @@ -9,8 +9,8 @@ CATEGORIES= editors elisp MASTER_SITES= http://git.chise.org/elisp/dist/flim/flim-1.14/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} -MAINTAINER?= nobutaka@FreeBSD.org -COMMENT?= Message representation or encoding elisp library for emacs +MAINTAINER= nobutaka@FreeBSD.org +COMMENT= Message representation or encoding elisp library for emacs LICENSE= GPLv2 @@ -49,31 +49,10 @@ MAKE_ARGS+= PREFIX="${STAGEDIR}${LOCALBA .include <bsd.port.pre.mk> -.if defined(EMACS_PORT_NAME) -.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel") -DEPPORT_SUFFIX= -.else -DEPPORT_SUFFIX= -${EMACS_PORT_NAME} -.endif -.if (${EMACS_PORT_NAME} == "emacs25") || (${EMACS_PORT_NAME} == "emacs-nox11") || (${EMACS_PORT_NAME} == "emacs-devel") PLIST= ${PKGDIR}/pkg-plist.emacs21 -.endif -# depends on apel (case of xemacs-21.x or later) -.if defined(EMACS_PACKAGESDIR) -BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:editors/xemacs-packages -RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:editors/xemacs-packages -MAKE_ARGS+= PACKAGEDIR="${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}" -.else -# depends on apel (case of gnu emacsen etc...) -BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX} -RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX} -.endif -.else -.BEGIN: - @${ECHO} "Error: Bad port." - @${ECHO} "You must define EMACS_PORT_NAME." - @${FALSE} -.endif +# depends on apel +BUILD_DEPENDS+= apel-${EMACS_PORT_NAME}>0:editors/apel +RUN_DEPENDS+= apel-${EMACS_PORT_NAME}>0:editors/apel .if !defined(BUILD_INFO_BY_EMACS) || (${BUILD_INFO_BY_EMACS} == "NO") # info files JIS to EUC @@ -205,7 +184,7 @@ manifest-install: @${RM} ${WRKDIR}/${MANIFEST} @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} - @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ + ${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ pkgcookie-install: Modified: head/editors/flim/files/patch-FLIM-CFG ============================================================================== --- head/editors/flim/files/patch-FLIM-CFG Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-FLIM-CFG Sun Nov 13 13:21:08 2016 (r426049) @@ -1,5 +1,5 @@ ---- FLIM-CFG.orig Tue Sep 15 15:26:08 1998 -+++ FLIM-CFG Sun May 9 01:33:26 1999 +--- FLIM-CFG.orig 2006-12-20 17:40:42 UTC ++++ FLIM-CFG @@ -8,6 +8,8 @@ (add-to-list 'load-path Modified: head/editors/flim/files/patch-eword-encode.el ============================================================================== --- head/editors/flim/files/patch-eword-encode.el Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-eword-encode.el Sun Nov 13 13:21:08 2016 (r426049) @@ -1,8 +1,8 @@ Index: eword-encode.el =================================================================== ---- eword-encode.el (revision 2) -+++ eword-encode.el (working copy) -@@ -162,15 +162,15 @@ +--- eword-encode.el.orig 2007-09-06 07:48:50 UTC ++++ eword-encode.el +@@ -162,15 +162,15 @@ MODE is allows `text', `comment', `phras ;;; (defmacro make-ew-rword (text charset encoding type) @@ -23,7 +23,7 @@ Index: eword-encode.el (defun ew-find-charset-rule (charsets) (if charsets -@@ -184,31 +184,31 @@ +@@ -184,30 +184,30 @@ MODE is allows `text', `comment', `phras ;; which is not depended on the Mule model. We should redesign ;; `eword-encode-split-string' to avoid to depend on the Mule model. (if (featurep 'utf-2000) @@ -58,12 +58,7 @@ Index: eword-encode.el - mode) - )) - wl))) -+ (let ((ret (ew-find-charset-rule (car word)))) -+ (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode) -+ ))) -+ wl)) -+ ) - +- -;; for legacy Mule -(defun tm-eword::words-to-ruled-words (wl &optional mode) - (mapcar (function @@ -73,7 +68,11 @@ Index: eword-encode.el - ))) - wl)) -) -- ++ (let ((ret (ew-find-charset-rule (car word)))) ++ (make-ew-rword (cdr word) (car ret)(nth 1 ret) mode) ++ ))) ++ wl)) ++ ) + (defun ew-space-process (seq) (let (prev a ac b c cc) - (while seq Modified: head/editors/flim/files/patch-hex-util.el ============================================================================== --- head/editors/flim/files/patch-hex-util.el Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-hex-util.el Sun Nov 13 13:21:08 2016 (r426049) @@ -1,7 +1,7 @@ Index: hex-util.el =================================================================== ---- hex-util.el (revision 2) -+++ hex-util.el (working copy) +--- hex-util.el.orig 2007-09-05 23:39:48 UTC ++++ hex-util.el @@ -28,14 +28,14 @@ (eval-when-compile Modified: head/editors/flim/files/patch-hmac-def.el ============================================================================== --- head/editors/flim/files/patch-hmac-def.el Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-hmac-def.el Sun Nov 13 13:21:08 2016 (r426049) @@ -1,6 +1,6 @@ ---- hmac-def.el.orig 2007-09-06 08:39:48.000000000 +0900 -+++ hmac-def.el 2012-08-23 00:42:35.000000000 +0900 -@@ -39,46 +39,46 @@ +--- hmac-def.el.orig 2007-09-05 23:39:48 UTC ++++ hmac-def.el +@@ -39,46 +39,46 @@ a string and return a digest of it (in b B is a byte-length of a block size of H. (B=64 for both SHA1 and MD5.) L is a byte-length of hash outputs. (L=16 for MD5, L=20 for SHA1.) If BIT is non-nil, truncate output to specified bits." Modified: head/editors/flim/files/patch-md4.el ============================================================================== --- head/editors/flim/files/patch-md4.el Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-md4.el Sun Nov 13 13:21:08 2016 (r426049) @@ -1,8 +1,8 @@ Index: md4.el =================================================================== ---- md4.el (revision 2) -+++ md4.el (working copy) -@@ -78,21 +78,20 @@ +--- md4.el.orig 2007-09-05 23:39:48 UTC ++++ md4.el +@@ -78,21 +78,20 @@ bytes long. N is required to handle str (setq m (md4-copy64 (substring buf 64))) (md4-64 m))) @@ -31,7 +31,7 @@ Index: md4.el (h2 (logand 65535 (+ h1 (lsh l1 -16)))) (l2 (logand 65535 l1)) ;; cyclic shift of 32 bits integer -@@ -102,7 +101,7 @@ +@@ -102,7 +101,7 @@ bytes long. N is required to handle str (l3 (logand 65535 (if (> s 15) (+ (lsh l2 (- s 32)) (lsh h2 (- s 16))) (+ (lsh l2 s) (lsh h2 (- s 16))))))) Modified: head/editors/flim/files/patch-md5-el.el ============================================================================== --- head/editors/flim/files/patch-md5-el.el Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-md5-el.el Sun Nov 13 13:21:08 2016 (r426049) @@ -1,6 +1,6 @@ ---- md5-el.el.orig 2000-11-06 22:03:19.000000000 +0900 -+++ md5-el.el 2012-08-23 00:42:35.000000000 +0900 -@@ -169,11 +169,10 @@ +--- md5-el.el.orig 2000-11-06 13:03:19 UTC ++++ md5-el.el +@@ -169,11 +169,10 @@ Returns a vector of 16 bytes containing (defsubst md5-I (x y z) (logxor y (logior x (logand 65535 (lognot z))))) (defmacro md5-make-step (name func) @@ -15,7 +15,7 @@ (m2 (logand 65535 (+ m1 (lsh l1 -16)))) (l2 (logand 65535 l1)) (m3 (logand 65535 (if (> s 15) -@@ -182,7 +181,7 @@ +@@ -182,7 +181,7 @@ Returns a vector of 16 bytes containing (l3 (logand 65535 (if (> s 15) (+ (lsh l2 (- s 32)) (lsh m2 (- s 16))) (+ (lsh l2 s) (lsh m2 (- s 16))))))) Modified: head/editors/flim/files/patch-mime-en.texi ============================================================================== --- head/editors/flim/files/patch-mime-en.texi Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-mime-en.texi Sun Nov 13 13:21:08 2016 (r426049) @@ -1,5 +1,5 @@ ---- ./mime-en.texi.orig 2002-10-08 15:50:05.000000000 +0000 -+++ ./mime-en.texi 2014-06-28 06:58:47.000000000 +0000 +--- mime-en.texi.orig 2002-10-08 15:50:05 UTC ++++ mime-en.texi @@ -1,7 +1,11 @@ \input texinfo.tex @c Generated automatically from mime-en.sgml by sinfo 3.7. Modified: head/editors/flim/files/patch-mime-ja.texi ============================================================================== --- head/editors/flim/files/patch-mime-ja.texi Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-mime-ja.texi Sun Nov 13 13:21:08 2016 (r426049) @@ -1,5 +1,5 @@ ---- ./mime-ja.texi.orig 2002-10-08 15:50:05.000000000 +0000 -+++ ./mime-ja.texi 2014-06-28 06:59:01.000000000 +0000 +--- mime-ja.texi.orig 2002-10-08 15:50:05 UTC ++++ mime-ja.texi @@ -1,7 +1,11 @@ \input texinfo.tex @c Generated automatically from mime-ja.sgml by sinfo 3.7. Modified: head/editors/flim/files/patch-sha1-el.el ============================================================================== --- head/editors/flim/files/patch-sha1-el.el Sun Nov 13 13:18:12 2016 (r426048) +++ head/editors/flim/files/patch-sha1-el.el Sun Nov 13 13:21:08 2016 (r426049) @@ -1,8 +1,8 @@ Index: sha1-el.el =================================================================== ---- sha1-el.el (revision 2) -+++ sha1-el.el (working copy) -@@ -125,91 +125,91 @@ +--- sha1-el.el.orig 2007-09-05 23:39:48 UTC ++++ sha1-el.el +@@ -125,91 +125,91 @@ If this variable is set to nil, use inte ;;; original definition of sha1-F0. ;;; (defmacro sha1-F0 (B C D)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611131321.uADDL8X7011025>