head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.12 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.10 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.8 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.6 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.4 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.2 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.7.0.6 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.4 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.2 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.6.0.122 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.120 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.118 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.116 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.114 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.112 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.110 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.108 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.106 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.104 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.102 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.100 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.98 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.96 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.92 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.72 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.94 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.90 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.88 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.86 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.84 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.82 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.80 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.78 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.76 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.74 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.70 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.68 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.66 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.64 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.62 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.60 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.58 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.56 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.54 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.52 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.50 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.48 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.46 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.44 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.42 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.40 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.38 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.36 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.34 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.32 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.30 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.28 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.26 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.24 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.22 pkgsrc-2011Q2-base:1.6 TNF:1.1.1 pkgsrc-2011Q1:1.6.0.20 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.18 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.16 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.14 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.12 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.10 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.8 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.6 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.4 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.2 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.5.0.46 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.44 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.42 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.40 pkgsrc-2008Q1:1.5.0.38 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.36 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.34 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.32 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.30 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.28 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.26 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.24 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.22 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.20 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.18 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.16 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.14 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.12 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.10 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.8 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.6 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.4 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.2 netbsd-1-6-1-base:1.5 netbsd-1-6:1.4.0.6 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.2 pkgviews-base:1.4 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 current:1.1.1.1; locks; strict; comment @# @; 1.8 date 2024.12.04.10.40.37; author nros; state Exp; branches; next 1.7; commitid FElBPpMxCABcIaAF; 1.7 date 2024.01.02.20.41.47; author nros; state Exp; branches; next 1.6; commitid 3Iflv0GJZFU2SUSE; 1.6 date 2008.11.30.08.43.16; author obache; state Exp; branches; next 1.5; 1.5 date 2002.10.08.12.38.26; author jlam; state Exp; branches; next 1.4; 1.4 date 2002.06.28.08.55.18; author agc; state Exp; branches; next 1.3; 1.3 date 2002.01.09.02.37.47; author fredb; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.40.53; author agc; state Exp; branches; next 1.1; 1.1 date 98.01.23.11.24.58; author bouyer; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.01.23.11.24.58; author bouyer; state Exp; branches; next ; desc @@ 1.8 log @graphics/pixmap: Fix build with newer libxpm libXpm version 3.5.17 and above hides the xpm* functions like xpmReadRgbNames that pixmap uses. Solve this by compiling rgb.c from libxpm with pixmap. The function names have been altered to not conflict the the functions in libxpm in versions where they are not hidden. @ text @$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. Use bundled version of rgb.c since libxpm does make the xpm* function names visible anymore. --- 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 @@@@ -56,8 +54,8 @@@@ LOCAL_LIBRARIES = -L$(XPM_LIBDIR) -lXpm #endif SYS_LIBRARIES = -lm - SRCS = PixEdit.c Pixmap.c Dialog.c - OBJS = PixEdit.o Pixmap.o Dialog.o + SRCS = PixEdit.c Pixmap.c Dialog.c rgb.c + OBJS = PixEdit.o Pixmap.o Dialog.o rgb.o #if ProjectX < 5 DEFINES = $(LOCAL_DEFINES) -DXPointer="char *" \ @@@@ -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) @ 1.7 log @pixmap: Make the program start, pkglint fixes pixmap segfaulted on startup, fix implicit function declarations in build to make it start. Also fix warning about casting pointer to an int of different size. Add comments to some patches. Set LICENSE. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2008/11/30 08:43:16 obache Exp $ d6 3 d49 11 @ 1.6 log @Various fixes: * 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. @ text @d1 5 a5 1 $NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $ @ 1.5 log @buildlink1 -> buildlink2 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2002/06/28 08:55:18 agc Exp $ d3 1 a3 1 --- Imakefile.orig Fri May 13 06:04:38 1994 d5 1 a5 1 @@@@ -8,7 +8,7 @@@@ d14 1 a14 1 @@@@ -21,22 +21,20 @@@@ d19 1 a19 1 +RGBTXT = ${X11BASE}/lib/X11/rgb.txt d42 12 a53 1 @@@@ -89,7 +87,7 @@@@ @ 1.4 log @Use the correct pathname for the rgb.txt in the presence of xpkgwedge @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2002/01/09 02:37:47 fredb Exp $ d30 1 a30 1 + XPM_INCLUDEDIR = $(BUILDLINK_DIR)/include @ 1.3 log @- - Enable the Motif option, to link against "openmotif". Looks great! - - Drop the dependency on "rman" -- don't need it. - - Bump the version number to 2.6.4nb1. @ text @d1 1 a1 1 $NetBSD$ d14 8 a21 1 @@@@ -27,16 +27,14 @@@@ d42 1 a42 1 @@@@ -89,7 +88,7 @@@@ @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 12 a14 3 --- ./Imakefile.org Fri May 13 04:04:38 1994 +++ ./Imakefile Mon Feb 27 16:31:46 1995 @@@@ -27,10 +27,9 @@@@ d19 1 a19 1 XPM_LIBDIR = $(LIBDIR)/xpm d22 2 a23 1 + XPM_INCLUDEDIR = $(INCDIR) d25 1 a25 1 EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER) d28 7 @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Import from the FreeBSD port collection. @ text @@