3 files changed, 49 insertions, 40 deletions

diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 3f0d53108cfb..159c0dafe745 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -20,25 +20,19 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=--program-prefix=''
 
-PORTDOCS=	README TODO AUTHORS
+DOCS=		README TODO AUTHORS
 
-MAN1=		lineakd.1
-#MANCOMPRESSED=	yes
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 		${WRKSRC}/lineak/Makefile.in ${WRKSRC}/lineakd/Makefile.in
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/lineakd.conf.example ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/lineakd.conf.example ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/lineakd/files/patch-lineakd__Makefile.in b/sysutils/lineakd/files/patch-lineakd__Makefile.in
index f23d93321a99..cdd6dcbb3c50 100644
--- a/sysutils/lineakd/files/patch-lineakd__Makefile.in
+++ b/sysutils/lineakd/files/patch-lineakd__Makefile.in
@@ -1,6 +1,6 @@
---- lineakd/Makefile.in.orig	2006-05-24 17:26:52.000000000 +0200
-+++ lineakd/Makefile.in	2013-02-18 16:29:24.000000000 +0100
-@@ -239,9 +239,9 @@
+--- lineakd/Makefile.in.orig	2006-05-24 23:26:52.000000000 +0800
++++ lineakd/Makefile.in	2013-11-15 21:28:05.000000000 +0800
+@@ -239,9 +239,9 @@ target_vendor = @target_vendor@
  unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
  unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
  lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp 
@@ -12,7 +12,7 @@
  INCLUDES = $(all_includes) -I$(top_srcdir)/lineak -I. -I..
  AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lineak -I$(top_srcdir)/lineakd -I. -I.. $(all_includes) 
  #>- all: all-am
-@@ -544,10 +544,10 @@
+@@ -544,25 +544,25 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  #man_MANS = lineakd.1.gz
  
@@ -25,17 +25,28 @@
 +install-data-local: lineakd.1.gz
  #>- 	$(mkinstalldirs) ${DESTDIR}$(sysconfdir)/
  #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/
-@@ -562,7 +562,7 @@
- 	$(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def
+-	$(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/
+ #>- 	$(mkinstalldirs) ${DESTDIR}$(mandir)/man1/
+ #>+ 1
+-	$(mkinstalldirs) $(DESTDIR)${DESTDIR}$(mandir)/man1/
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
+ #>- 	$(mkinstalldirs) ${DESTDIR}$(pkglibdir)/plugins/
+ #>+ 1
+-	$(mkinstalldirs) $(DESTDIR)${DESTDIR}$(pkglibdir)/plugins/
++	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/plugins/
+ #>- 	$(INSTALL_DATA) $(srcdir)/lineakkb.def ${DESTDIR}$(sysconfdir)/lineakkb.def
+ #>+ 1
+-	$(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def
++	$(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)$(sysconfdir)/lineakkb.def
  #>- 	$(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 ${DESTDIR}$(mandir)/man1/lineakd.1.bz2
  #>+ 1
 -	$(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 $(DESTDIR)${DESTDIR}$(mandir)/man1/lineakd.1.bz2
-+	$(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(DESTDIR)${DESTDIR}$(mandir)/man1/lineakd.1.gz
++	$(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(DESTDIR)$(mandir)/man1/lineakd.1.gz
  	 if test "$(SETKEYCODES_SUID)" != "no" ; then \
             chown root `which setkeycodes` ; \
             chmod +s `which setkeycodes` ; \
-@@ -574,7 +574,7 @@
+@@ -574,7 +574,7 @@ uninstall-local:
  	-rm -f $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def
  #>- 	-rm -f ${DESTDIR}$(mandir)/man1/lineakd.1.bz2
  #>+ 1
diff --git a/sysutils/lineakd/pkg-plist b/sysutils/lineakd/pkg-plist
index 6df5f4a01767..529cf3ca2e63 100644
--- a/sysutils/lineakd/pkg-plist
+++ b/sysutils/lineakd/pkg-plist
@@ -1,36 +1,40 @@
 bin/lineakd
 etc/lineakkb.def
+include/lineak/cdromctrl.h
+include/lineak/commandexec.h
 include/lineak/configdirectives.h
 include/lineak/configloader.h
 include/lineak/definitions.h
 include/lineak/defloader.h
+include/lineak/displayctrl.h
+include/lineak/lbutton.h
+include/lineak/lcommand.h
 include/lineak/lconfig.h
 include/lineak/lconfigdata.h
 include/lineak/ldef.h
-include/lineak/lobject.h
+include/lineak/lineak_core_functions.h
+include/lineak/lineak_util_functions.h
 include/lineak/lkbd.h
 include/lineak/lkey.h
-include/lineak/lbutton.h
 include/lineak/loader.h
-include/lineak/msgpasser.h
-include/lineak/saver.h
-include/lineak/lcommand.h
+include/lineak/lobject.h
 include/lineak/lockctrl.h
-include/lineak/lineak_util_functions.h
-include/lineak/lineak_core_functions.h
-include/lineak/cdromctrl.h
-include/lineak/xmgr.h
-include/lineak/displayctrl.h
+include/lineak/msgpasser.h
 include/lineak/plugin_definitions.h
-include/lineak/commandexec.h
 include/lineak/pluginmanager.h
-lib/liblineak.so.8
-lib/liblineak.so
+include/lineak/saver.h
+include/lineak/xmgr.h
 lib/liblineak.a
 lib/liblineak.la
-@exec mkdir -p %D/lib/lineakd/plugins
-%%EXAMPLESDIR%%/lineakd.conf.example
-@dirrm %%EXAMPLESDIR%%
-@dirrm include/lineak
-@dirrm lib/lineakd/plugins
-@dirrm lib/lineakd
+lib/liblineak.so
+lib/liblineak.so.8
+man/man1/lineakd.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lineakd.conf.example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry lib/lineakd/plugins
+@dirrmtry lib/lineakd
+@dirrmtry include/lineak