3 files changed, 40 insertions, 20 deletions

diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index 709a5e2b1c0a..c9c9c8f692f8 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -6,29 +6,35 @@
 #
 
 PORTNAME=	howm
-PORTVERSION=	1.1.0.4
+PORTVERSION=	1.1.1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Write fragmentarily and read collectively
 
+GNU_CONFIGURE=	yes
 EMACS_PORT_NAME?=	emacs21
-ELISP=		action-lock.el \
-		howm-font-lock.el howm-menu.el howm-mode.el howm-view.el
-
-do-build:
-.for i in ${ELISP}
-	cd ${WRKSRC}; ${EMACS_CMD} -q -batch -L . -f batch-byte-compile ${i}
-.endfor
+ELISP=		action-lock.el bcomp.el cheat-font-lock.el \
+		howm-common.el howm-date.el howm-menu.el howm-misc.el \
+		howm-mode-mode.el howm-mode.el howm-reminder.el \
+		howm-version.el howm-view.el
+.if defined(WITH_COMPILED_ELISP)
+PLIST_SUB=	COMPILED_ELISP=""
+.else
+PLIST_SUB=	COMPILED_ELISP="@comment "
+.endif
 
 do-install:
-	cd ${WRKSRC}; ${INSTALL_DATA} *.el *.elc ${PREFIX}/${EMACS_SITE_LISPDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} *.el ${PREFIX}/${EMACS_SITE_LISPDIR}
+.if defined(WITH_COMPILED_ELISP)
+	cd ${WRKSRC}; ${INSTALL_DATA} *.elc ${PREFIX}/${EMACS_SITE_LISPDIR}
+.endif
 	${MKDIR} ${EXAMPLESDIR}/ja ${EXAMPLESDIR}/en
-	cd ${WRKSRC}; ${INSTALL_DATA} ja/* ${EXAMPLESDIR}/ja
-	cd ${WRKSRC}; ${INSTALL_DATA} en/* ${EXAMPLESDIR}/en
+	cd ${WRKSRC}; ${INSTALL_DATA} ja/0* ${EXAMPLESDIR}/ja
+	cd ${WRKSRC}; ${INSTALL_DATA} en/0* ${EXAMPLESDIR}/en
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} *.html *.png ${DOCSDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png ${DOCSDIR}
 
 post-install:
 	@${ECHO}
diff --git a/deskutils/howm/distinfo b/deskutils/howm/distinfo
index 6c6f40656c5e..a64320470cdb 100644
--- a/deskutils/howm/distinfo
+++ b/deskutils/howm/distinfo
@@ -1,2 +1,2 @@
-MD5 (howm-1.1.0.4.tar.gz) = 7d4c243927dda60ae3bfcaaaba96819d
-SIZE (howm-1.1.0.4.tar.gz) = 139495
+MD5 (howm-1.1.1.tar.gz) = 1614fad9b9b04440899e8ac2f14258a0
+SIZE (howm-1.1.1.tar.gz) = 231717
diff --git a/deskutils/howm/pkg-plist b/deskutils/howm/pkg-plist
index 584ea787744d..1545830197b2 100644
--- a/deskutils/howm/pkg-plist
+++ b/deskutils/howm/pkg-plist
@@ -1,13 +1,27 @@
 %%EMACS_SITE_LISPDIR%%/action-lock.el
-%%EMACS_SITE_LISPDIR%%/action-lock.elc
-%%EMACS_SITE_LISPDIR%%/howm-font-lock.el
-%%EMACS_SITE_LISPDIR%%/howm-font-lock.elc
+%%EMACS_SITE_LISPDIR%%/bcomp.el
+%%EMACS_SITE_LISPDIR%%/cheat-font-lock.el
+%%EMACS_SITE_LISPDIR%%/howm-common.el
+%%EMACS_SITE_LISPDIR%%/howm-date.el
 %%EMACS_SITE_LISPDIR%%/howm-menu.el
-%%EMACS_SITE_LISPDIR%%/howm-menu.elc
+%%EMACS_SITE_LISPDIR%%/howm-misc.el
+%%EMACS_SITE_LISPDIR%%/howm-mode-mode.el
 %%EMACS_SITE_LISPDIR%%/howm-mode.el
-%%EMACS_SITE_LISPDIR%%/howm-mode.elc
+%%EMACS_SITE_LISPDIR%%/howm-reminder.el
+%%EMACS_SITE_LISPDIR%%/howm-version.el
 %%EMACS_SITE_LISPDIR%%/howm-view.el
-%%EMACS_SITE_LISPDIR%%/howm-view.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/action-lock.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/bcomp.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/cheat-font-lock.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-common.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-date.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-menu.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-misc.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-mode-mode.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-mode.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-reminder.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-version.elc
+%%COMPILED_ELISP%%%%EMACS_SITE_LISPDIR%%/howm-view.elc
 %%EXAMPLESDIR%%/en/0000-00-00-000000.howm
 %%EXAMPLESDIR%%/ja/0000-00-00-000000.howm
 %%DOCSDIR%%/README-j.html