apcupsd: move from old packages and Makefile updated