dca0625c6b
* Remove copy of X11 header files for old X11, it may cause build failure with recent X, like a PR 39975. * Need rgb.txt, add dependency on x11/rgb for X11_TYPE=modular. And fix path for the file (SUBST.rgb and patch-ac). * Add DESTDIR support. it seems that rules of imake deal spaces after cammna as part of the argument (patch-ac). * Replace IMAKE_MANNEWSUFFIX with IMAKE_MAN_SUFFIX in PLIST. * hard coded errno and sys_errlist is not portable these days (patch-ab) * sort PLIST * regen patches with unfied diff. Bump PKGREVISION.
61 lines
2.1 KiB
Text
61 lines
2.1 KiB
Text
$NetBSD: patch-ac,v 1.6 2008/11/30 08:43:16 obache Exp $
|
|
|
|
--- 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" <APixmap.ad >Pixmap.ad
|
|
+ @sed -e "s#@PIXMAPDIR@#$(PIXMAPDIR)/#g" -e "s/^Pixmap//" <APixmap.ad >Pixmap.ad
|
|
#endif
|
|
|
|
dotpixmap: $(RGBTXT)
|