Improve synergy package discussed with minskim@.

- honor PKG_SYSCONFDIR not hard-coded to "/etc" and PKG_INSTALL frame work
  for a configuration file.
- Install documents.

Bump PKGREVISION.
This commit is contained in:
taca 2006-08-17 14:02:23 +00:00
parent 5430e13315
commit b3e9e6fc03
5 changed files with 75 additions and 3 deletions

View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.5 2006/07/22 04:46:17 rillig Exp $
# $NetBSD: Makefile,v 1.6 2006/08/17 14:02:23 taca Exp $
#
DISTNAME= synergy-1.3.1
PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synergy2/}
@ -11,6 +12,20 @@ COMMENT= Let an user share a mouse and keyboard among computers
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
DOCDIR= ${PREFIX}/share/doc/html/${PKGBASE}
EXAMPLSEDIR= ${PREFIX}/share/examples/${PKGBASE}
DOCS= *.html *.css images/*.gif
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}/images
cd ${WRKSRC}/doc; \
for f in ${DOCS}; do \
${INSTALL_DATA} $$f ${DOCDIR}/$$f; \
done
${INSTALL_DATA_DIR} ${EXAMPLSEDIR}
${INSTALL_DATA} ${WRKSRC}/examples/synergy.conf ${EXAMPLSEDIR}
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"

View file

@ -1,3 +1,29 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/21 19:43:06 minskim Exp $
@comment $NetBSD: PLIST,v 1.2 2006/08/17 14:02:23 taca Exp $
bin/synergyc
bin/synergys
share/doc/html/${PKGBASE}/about.html
share/doc/html/${PKGBASE}/authors.html
share/doc/html/${PKGBASE}/autostart.html
share/doc/html/${PKGBASE}/banner.html
share/doc/html/${PKGBASE}/border.html
share/doc/html/${PKGBASE}/compiling.html
share/doc/html/${PKGBASE}/configuration.html
share/doc/html/${PKGBASE}/contact.html
share/doc/html/${PKGBASE}/developer.html
share/doc/html/${PKGBASE}/faq.html
share/doc/html/${PKGBASE}/history.html
share/doc/html/${PKGBASE}/home.html
share/doc/html/${PKGBASE}/images/logo.gif
share/doc/html/${PKGBASE}/images/warp.gif
share/doc/html/${PKGBASE}/index.html
share/doc/html/${PKGBASE}/license.html
share/doc/html/${PKGBASE}/news.html
share/doc/html/${PKGBASE}/roadmap.html
share/doc/html/${PKGBASE}/running.html
share/doc/html/${PKGBASE}/security.html
share/doc/html/${PKGBASE}/synergy.css
share/doc/html/${PKGBASE}/tips.html
share/doc/html/${PKGBASE}/toc.html
share/doc/html/${PKGBASE}/trouble.html
@dirrm share/doc/html/${PKGBASE}/images
@dirrm share/doc/html/${PKGBASE}

View file

@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.3 2006/06/01 23:31:59 minskim Exp $
$NetBSD: distinfo,v 1.4 2006/08/17 14:02:23 taca Exp $
SHA1 (synergy-1.3.1.tar.gz) = 03113ec8aadfecaeba8e369b083f4fb5b44f5c62
RMD160 (synergy-1.3.1.tar.gz) = 5f5d7cb8fcfb57a6c8eae83fb53c704cb85c6c16
Size (synergy-1.3.1.tar.gz) = 793172 bytes
SHA1 (patch-aa) = da4ad36cdcec251bf4334c2dccd68346042894de
SHA1 (patch-ab) = fae459f7063a6a879b385a94d5e889877c94860d

View file

@ -0,0 +1,16 @@
$NetBSD: patch-aa,v 1.1 2006/08/17 14:02:23 taca Exp $
--- lib/arch/CArchFileUnix.cpp.orig 2005-04-24 12:02:12.000000000 +0900
+++ lib/arch/CArchFileUnix.cpp
@@ -80,7 +80,10 @@ CArchFileUnix::getUserDirectory()
std::string
CArchFileUnix::getSystemDirectory()
{
- return "/etc";
+#ifndef CONFIG_DIR
+#define CONFIG_DIR "/etc"
+#endif
+ return CONFIG_DIR;
}
std::string

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ab,v 1.1 2006/08/17 14:02:23 taca Exp $
--- lib/arch/Makefile.in.orig 2006-04-03 05:09:44.000000000 +0900
+++ lib/arch/Makefile.in
@@ -246,7 +246,7 @@ libarch_a_OBJECTS = $(am_libarch_a_OBJEC
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DCONFIG_DIR=\"${sysconfdir}\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp