Re: CVS commit: pkgsrc/inputmethod/skkinput

["OBATA Akio" <obache%netbsd.org@localhost>]

On Sat, 17 Dec 2011 16:43:48 +0900, John Marino <marino%netbsd.org@localhost> 
wrote:

> On 12/17/2011 3:16 AM, OBATA Akio wrote:
> > On Sat, 17 Dec 2011 09:54:11 +0900, John Marino <marino%netbsd.org@localhost>
> > wrote:
> >
> > > Module Name:    pkgsrc
> > > Committed By:    marino
> > > Date:        Sat Dec 17 00:54:11 UTC 2011
> > >
> > > Modified Files:
> > >     pkgsrc/inputmethod/skkinput: Makefile PLIST
> > >
> > > Log Message:
> > > inputmethod/sskinput: DragonFly-specific handling of PLIST
> > >
> > > DragonFly dumps the documention in man1 instead of cat1. (Not sure why
> > > it's different from NetBSD).  PLIST substitution handles both cases.
> >
> > It depend on IMAKE_MAN_SOURCE_PATH.
> > See pkgsrc/mk/platform/*.mk, and patch-aa.
> Thanks!  I took a look at mk/platform/dragonfly.mk to see if
> could make a better, generic fix using predefined variables but
> it doesn't appear that there is a better solution than the one
> I came up with.  IMAKE_MAN_SOURCE_PATH = "man/man".  Had it been
> something like "${A}/${B}" I could have come up with a generic
> solution easily.

How about following?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/skkinput/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile    17 Dec 2011 00:54:11 -0000      1.16
+++ Makefile    17 Dec 2011 08:55:44 -0000
@@ -19,13 +19,7 @@

 INSTALLATION_DIRS=     ${DOCSDIR}

-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-PLIST_SUBST+=  CATMAN=man1
-.else
-PLIST_SUBST+=  CATMAN=cat1
-.endif
+PLIST_SUBST+=  
IMAKE_JMAN_DIR=${IMAKE_MAN_DIR:ts/:H}/ja_JP.EUC/${IMAKE_MAN_DIR:ts/:T}

 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README.jis    ${DESTDIR}${PREFIX}/${DOCSDIR}
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/skkinput/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST       17 Dec 2011 00:54:11 -0000      1.6
+++ PLIST       17 Dec 2011 08:55:44 -0000
@@ -2,7 +2,7 @@
 bin/skkinput
 lib/X11/app-defaults/Skkinput
 ${IMAKE_MAN_DIR}/skkinput.${IMAKE_MAN_SUFFIX}
-man/ja_JP.EUC/${CATMAN}/skkinput.${IMAKE_MAN_SUFFIX}
+${IMAKE_JMAN_DIR}/skkinput.${IMAKE_MAN_SUFFIX}
 share/doc/skkinput/BUGS.jis
 share/doc/skkinput/FAQ.jis
 share/doc/skkinput/README.jis


--
OBATA Akio / obache%NetBSD.org@localhost