Sunday, June 26, 2005


Some time ago, my wife convinced to get a kitten. A friend of a friend had a brand new litter, and was giving them away. I've never been a cat person, so I wasn't entirely sure it was a good idea. However we did want a more interesting pet than a fish, and our apartment doesn't allow dogs. So we got Oscar The Cat:

We got him when he was only five weeks old. So he was very hyper. Being a kitten, he likes a bit of rough play now and again. We asked the vet how we might get him not to do that with the children. Her suggestion was to get another cat. I wasn't convinced that having two misbehaving animals would be better than having one. So that idea was nixed.

Since then, we've cat-sit for friends a number of times. And Oscar really was better behaved when he had another cat around to play with. So we started looking for another cat.

As luck would have it, one of Melissa's co-workers had a pair of black cats that needed a new home. Their previous owner was allergic, and none of the cat allergy medications really helped her. We picked them up last Thursday.

So now we have Missy:

She took a while to warm up to the new humans, but when she did it was like flipping a switch. She went from hissing at us to make us go away to hopping onto laps demanding that we pet her.

And here is her brother:

The picture doesn't really show it, but he is a giant cat. He's still not sure that he likes the new people at all. He spent a very long time hiding in our basement, and only came out after we calmed him with catnip. If he's not calmer by Wednesday, we might be going to the vet to get him some kitty drugs.

His previous owner called him "One-Claw" because when he was declawed, there was one claw on his left paw that the vet missed. I'd like to get him a better name than that though. I'm leaning toward Claude, but it needs the approval of the executive committee (i.e., my wife).

So that's what we've been doing for entertainment the last few days. We're turning into a bunch of cat-ladies.

Tuesday, June 14, 2005

Updates: Fink Stuff

I'm up to 23 fink packages. I know that's nothing compared to some other maintainers, but I'm still pleased with myself for it.

I've decided that just editing my packages from inside the CVS tree is too error-prone, especially in terms of keeping packages for several differing trees in sync.

Simply keeping a sandbox around with a master copy of the .info and using 'install' or similar to copy the master copy into the appropriate distributions would squish changes from upstream. That would be bad. I settled on using emacs' ediff-mode to handle this.

And as long as I'm automating this process, it would be nice to automate generation of ssl and non-ssl versions for packages that need this. To do this I settled on using a little bit of perl-fu to change the name of the package appropriately, and then a bit of magic with the Variants system to handle the rest.

Here's a snippet of the Makefile (insert tabs where needed) I'm using:

SSL=perl -pi~ -e 's/(Package: (?!%N)[^%\n]+)(%type_pkg.+)?/\1-ssl\2/'

#Fink unstable for 10.3

define merge
diff -q $(1) `basename $(1)` || ( touch $(1) && mv $(1) orig && emacs --eval "(ediff-merge-files \"orig\" \"`basename $(1)`\" nil \"$(1)\" )" && rm orig )

define check
fink -v validate $(1) | grep "looks good"

# libnasl3 #
$(call merge,$(F103u-lib)
$(call merge,$(F103u-lib)libnasl3.patch)
cp libnasl3.patch libnasl3-ssl.patch
$(call merge,$(F103u-crypto)
$(call merge,$(F103u-crypto)libnasl3-ssl.patch)
rm libnasl3-ssl.*
$(call check,$(F103u-lib) && $(call check,$(F103u-crypto) && cd /sw/fink && cvs ci 10.3/unstable/main/finkinfo/libs/ 10.3/unstable/main/finkinfo/libs/libnasl3.patch 10.3/unstable/crypto/finkinfo/ 10.3/unstable/crypto/finkinfo/libnasl3-ssl.patch

So far I'm quite pleased with it. But we'll see how it turns out as I use it for more things.