$NetBSD: patch-ac,v 1.7 2024/01/02 20:41:47 nros Exp $ Use Motif to build pixmap. Use rgb.txt from x11/rgb. Use pkgsrc libXpm. --- Imakefile.orig 1994-05-13 11:04:38.000000000 +0000 +++ Imakefile @@ -8,7 +8,7 @@ XCOMM Created: April 20, 1991. XCOMM XCOMM def/undef USE_MOTIF there if you want Pixmap to use Motif or not. -#undef USE_MOTIF +#define USE_MOTIF #ifdef HPArchitecture CCOPTIONS = -Aa -D_HPUX_SOURCE -DNO_EDITRES #if ProjectX > 4 @@ -21,22 +21,20 @@ R5EXT = -I. #endif XCOMM Where you have rgb.txt -RGBTXT = $(LIBDIR)/rgb.txt +RGBTXT = @RGBTXT@ XCOMM LUCS extra variable for where bitmaps go PIXMAPDIR = $(LIBDIR)/Pixmap XCOMM Specify here your Xpm installation directories - XPM_INCLUDEDIR = /usr/local/include - XPM_LIBDIR = $(LIBDIR)/xpm - XPM_INCLUDEDIR = /net/koala/include - XPM_LIBDIR = /net/koala/lib/sun4 - EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER) + XPM_INCLUDEDIR = $(LOCALBASE)/include + XPM_LIBDIR = $(USRLIBDIR) + EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I$(MOTIFBASE)/include #ifdef USE_MOTIF XCOMM Motif configuration LOCAL_DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES) -D_NO_PROTO -LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm -L/usr/lib/$(MOTIFVER) -lXm $(XMULIB) $(XTOOLLIB) $(XLIB) +LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm ${MOTIFLIB} -lXm $(XMULIB) $(XTOOLLIB) $(XLIB) BITMAPS = MDown MFlipHoriz MFlipVert MFold MLeft MRight MRotateLeft \ MRotateRight Stipple MUp #else @@ -70,8 +68,8 @@ LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm ComplexProgramTarget(pixmap) InstallAppDefaults(Pixmap) -MakeDirectories(install, $(PIXMAPDIR)) -InstallMultipleFlags($(BITMAPS), $(PIXMAPDIR), $(INSTDATFLAGS)) +MakeDirectories(install,$(PIXMAPDIR)) +InstallMultipleFlags($(BITMAPS),$(PIXMAPDIR),$(INSTDATFLAGS)) AllTarget(dotpixmap) @@ -89,7 +87,7 @@ NamedMakeSubdirs(Xgnu, SelFile) Pixmap.ad: APixmap.ad @echo Pixmap compiled with Athena. - @sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" Pixmap.ad + @sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" -e "s/^Pixmap//" Pixmap.ad #endif dotpixmap: $(RGBTXT)