Updating the astro/XEphem port

[Adam Weinberger]

Josh Paetzel wrote:
> I seem to be having trouble upgrading the astro/xephem port.  There is 
> a patch in ./files named patch-aa
> 
> http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/slow-patch.html
> 
> "Each set of patches you wish to apply should be collected into a file 
> named patch-* where * indicates the pathnames of the files that are 
> patched."

You've hit on precisely why the rule you've quoted exists. The patch-aa, 
patch-ab, etc. thing was the old (rather brain-dead) way of doing 
things. I personally enjoy opportunities to whack patches created with 
the old-style naming scheme. (We don't do this without reason, though, 
such as an update.)

> The contents of patch-aa:
> 
> gimpy# cat patch-aa
> --- Imakefile.orig      Tue Mar 16 09:00:21 1999
> +++ Imakefile   Sun Apr  4 15:06:31 1999
> @@ -63,7 +63,7 @@
>  SRCS =         $(OBJS:.o=.c)
> 
>  XCOMM Sometimes you need -lXp after -lXm
> -          XMLIB = -lXm
> +          XMLIB = ${MOTIFLIB}
>          DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
>   EXTRA_INCLUDES = -I../../libastro
>    LOCAL_LDFLAGS = -L../../libastro
> 
> I can't seem to find a relevant Imakefile.orig or Imakefile
> 
> My problem is that when I bump the version in the Makefile and update 
> distinfo then make dies with the following error:
> 
> File to patch: Imakefile
> No file found--skip this patch? [n]
> => Patch patch-aa failed to apply cleanly.
> *** Error code 1
> 
> Stop in /usr/ports/astro/xephem.
> 
> Thanks very much for a kick in the right direction. :)

Looks like the Imakefile file was removed in the version you're 
attempting to port. My advice would be to grep around for 
Makefile-related files that contain the string -lXm, and patch those 
files similar to the patch you've pasted above. (Of course, use the new 
naming scheme for them ;;-).)

Note, however, that patch-aa is over 9 years old, and may not be 
necessary any longer. Give the build of xephem-3.7.1 a try without it 
and see what happens.

# Adam


-- 
Adam Weinberger
adamw at magnesium.net || adamw at FreeBSD.org
adamw at vectors.cx    ||   adamw at gnome.org
http://www.vectors.cx
"It's not stupid. It's advanced."  -- Almighty Tallest