diff -ru ports/x11-drivers/xf86-input-wacom/Makefile /usr/ports/x11-drivers/xf86-input-wacom/Makefile --- ports/x11-drivers/xf86-input-wacom/Makefile 2008-11-11 20:40:40.000000000 +0100 +++ /usr/ports/x11-drivers/xf86-input-wacom/Makefile 2008-11-12 09:16:50.000000000 +0100 @@ -24,7 +24,12 @@ USE_GMAKE= yes USE_RC_SUBR= wacom -PLIST_SUB= DESTDIR=${DESTDIR} +KMODDIR?= /boot/modules +MODULESDIR?= lib/xorg/modules/input +MANDIR?= man/man4 + +PLIST_SUB+= MODULESDIR=${MODULESDIR} KMODDIR=${KMODDIR} +SUB_LIST+= KMODDIR=${KMODDIR} XORG_CAT= driver @@ -45,11 +50,14 @@ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} do-install: - @${INSTALL} ${WRKDIR}/uwacom/uwacom.ko ${DESTDIR}/boot/modules/ + ${MKDIR} ${KMODDIR} + @${INSTALL_KLD} ${WRKDIR}/uwacom/uwacom.ko ${KMODDIR}/ + ${MKDIR} ${PREFIX}/${MODULESDIR} @${INSTALL} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/xdrv/wacom_drv.so \ - ${PREFIX}/lib/xorg/modules/input/ + ${PREFIX}/${MODULESDIR}/ + ${MKDIR} ${PREFIX}/${MANDIR} @${INSTALL_MAN} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/wacom.4x.gz \ - ${PREFIX}/man/man4/ + ${PREFIX}/${MANDIR}/ post-install: @${CAT} ${PKGMESSAGE} diff -ru ports/x11-drivers/xf86-input-wacom/files/wacom.in /usr/ports/x11-drivers/xf86-input-wacom/files/wacom.in --- ports/x11-drivers/xf86-input-wacom/files/wacom.in 2008-11-11 20:40:40.000000000 +0100 +++ /usr/ports/x11-drivers/xf86-input-wacom/files/wacom.in 2008-11-12 08:11:10.000000000 +0100 @@ -17,6 +17,7 @@ . %%RC_SUBR%% +kmod="%%KMODDIR%%/uwacom.ko" name="wacom" rcvar=${name}_enable @@ -346,7 +347,7 @@ return 0 fi echo "Starting ${name}." - /sbin/kldload uwacom + /sbin/kldload $kmod } do_stop() { @@ -355,7 +356,7 @@ return 0 fi echo "Stopping ${name}." - /sbin/kldunload uwacom + /sbin/kldunload $kmod } load_rc_config $name diff -ru ports/x11-drivers/xf86-input-wacom/pkg-message /usr/ports/x11-drivers/xf86-input-wacom/pkg-message --- ports/x11-drivers/xf86-input-wacom/pkg-message 2008-11-11 20:40:40.000000000 +0100 +++ /usr/ports/x11-drivers/xf86-input-wacom/pkg-message 2008-11-12 08:42:31.000000000 +0100 @@ -2,13 +2,16 @@ run the following commands as the root user: # echo 'wacom_enable="YES"' >> /etc/rc.conf -# /usr/local/etc/rc.d/wacom setup +# ${PREFIX}/etc/rc.d/wacom setup -You can clean up the Xorg configuration by running the following line: -# /usr/local/etc/rc.d/wacom cleanup +You can unload the driver and clean up the Xorg configuration by running +the following lines before deinstalling: + +# ${PREFIX}/etc/rc.d/wacom stop +# ${PREFIX}/etc/rc.d/wacom cleanup To activate the driver without rebooting run: -# /usr/local/etc/rc.d/wacom start +# ${PREFIX}/etc/rc.d/wacom start Now (re)plug in your tablet and restart X. diff -ru ports/x11-drivers/xf86-input-wacom/pkg-plist /usr/ports/x11-drivers/xf86-input-wacom/pkg-plist --- ports/x11-drivers/xf86-input-wacom/pkg-plist 2008-11-11 20:40:40.000000000 +0100 +++ /usr/ports/x11-drivers/xf86-input-wacom/pkg-plist 2008-11-12 08:51:03.000000000 +0100 @@ -1,3 +1,3 @@ -lib/xorg/modules/input/wacom_drv.so -@cwd %%DESTDIR%%/ -boot/modules/uwacom.ko +%%MODULESDIR%%/wacom_drv.so +@cwd %%KMODDIR%% +uwacom.ko