Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

4
graphics/xpaint/DESCR Normal file
View File

@@ -0,0 +1,4 @@
XPaint is a color image editing tool which features most standard
paint program options. It allows for the editing of multiple images
simultaneously and supports various formats, including PPM, XBM, TIFF,
etc.

48
graphics/xpaint/Makefile Normal file
View File

@@ -0,0 +1,48 @@
# $NetBSD: Makefile,v 1.74 2013/04/06 21:07:33 rodent Exp $
DISTNAME= xpaint-2.7.8.1
PKGREVISION= 10
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://sf-xpaint.sourceforge.net/
COMMENT= Simple paint program
USE_IMAKE= yes
USE_TOOLS+= gmake
MAKE_ENV+= XMKMF=${XMKMF:Q}
MAKE_JOBS_SAFE= NO
SUBST_CLASSES+= foo
SUBST_STAGE.foo= pre-configure
SUBST_FILES.foo= Local.config configure
SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g"
SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g"
SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g"
SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
INSTALLATION_DIRS+= bin lib/X11/app-defaults ${PKGMANDIR}/cat1
INSTALLATION_DIRS+= share/xpaint
INSTALLATION_DIRS+= share/xpaint/include
INSTALLATION_DIRS+= share/xpaint/c_scripts
INSTALLATION_DIRS+= share/xpaint/c_scripts/3d_surfaces
INSTALLATION_DIRS+= share/xpaint/c_scripts/filters
INSTALLATION_DIRS+= share/xpaint/c_scripts/images
INSTALLATION_DIRS+= share/xpaint/c_scripts/layers
INSTALLATION_DIRS+= share/xpaint/c_scripts/procedures
INSTALLATION_DIRS+= share/xpaint/c_scripts/3d_curves
INSTALLATION_DIRS+= share/xpaint/help
INSTALLATION_DIRS+= share/xpaint/messages
pre-configure:
cd ${WRKSRC} && ./configure xaw3dg
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/Xaw3d/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

56
graphics/xpaint/PLIST Normal file
View File

@@ -0,0 +1,56 @@
@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:59:32 joerg Exp $
bin/xpaint
${IMAKE_MAN_DIR}/xpaint.${IMAKE_MAN_SUFFIX}
lib/X11/app-defaults/XPaint
lib/X11/app-defaults/XPaint_es
lib/X11/app-defaults/XPaint_fr
share/xpaint/XPaintIcon.xpm
share/xpaint/c_scripts/3d_curves/helicoid.c
share/xpaint/c_scripts/3d_curves/lissajous.c
share/xpaint/c_scripts/3d_surfaces/ellipsoid.c
share/xpaint/c_scripts/3d_surfaces/heart.c
share/xpaint/c_scripts/3d_surfaces/hyperboloid.c
share/xpaint/c_scripts/3d_surfaces/polyhedra.c
share/xpaint/c_scripts/3d_surfaces/torus.c
share/xpaint/c_scripts/3d_surfaces/trefoil.c
share/xpaint/c_scripts/3d_surfaces/waves.c
share/xpaint/c_scripts/filters/leftright.c
share/xpaint/c_scripts/filters/mapping.c
share/xpaint/c_scripts/filters/merge.c
share/xpaint/c_scripts/filters/permute.c
share/xpaint/c_scripts/filters/rotleft.c
share/xpaint/c_scripts/filters/rotright.c
share/xpaint/c_scripts/filters/updown.c
share/xpaint/c_scripts/images/random.c
share/xpaint/c_scripts/layers/combine.c
share/xpaint/c_scripts/procedures/setmemory.c
share/xpaint/help/Help
share/xpaint/help/Help_es
share/xpaint/help/Help_fr
share/xpaint/include/Colormap.h
share/xpaint/include/ColormapP.h
share/xpaint/include/DefaultRC.txt.h
share/xpaint/include/Paint.h
share/xpaint/include/PaintP.h
share/xpaint/include/XPaint.ad.h
share/xpaint/include/Xpaint.h
share/xpaint/include/Xpaint3d.h
share/xpaint/include/color.h
share/xpaint/include/graphic.h
share/xpaint/include/hash.h
share/xpaint/include/image.h
share/xpaint/include/menu.h
share/xpaint/include/messages.h
share/xpaint/include/misc.h
share/xpaint/include/operation.h
share/xpaint/include/ops.h
share/xpaint/include/palette.h
share/xpaint/include/patchlevel.h
share/xpaint/include/protocol.h
share/xpaint/include/rc.h
share/xpaint/include/region.h
share/xpaint/include/text.h
share/xpaint/include/xpaint.h
share/xpaint/messages/Messages
share/xpaint/messages/Messages_es
share/xpaint/messages/Messages_fr

15
graphics/xpaint/distinfo Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: distinfo,v 1.23 2012/10/24 15:38:43 joerg Exp $
SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa
RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf
Size (xpaint-2.7.8.1.tar.bz2) = 459429 bytes
SHA1 (patch-aa) = c0f7d49081c3440b836754966527e39ee1bcabec
SHA1 (patch-ab) = 653a8873434093b4fc27e57a26e850ca23ec3556
SHA1 (patch-ac) = 78ba5e1c2b0bb5e9abfd12783454d5b30499d5f0
SHA1 (patch-ad) = a9223ef202e8fb00186be09d2ae6ae8d5d9968cc
SHA1 (patch-ae) = 5ecb812e962701a6d5f068bb7744c5115b2eb263
SHA1 (patch-af) = 73f1289ca104f4c53e8d184251d5a84c5c1ec7ab
SHA1 (patch-ag) = a8eba89d7389a3e0b0973bf3a3c25a76ae7e0d84
SHA1 (patch-ai) = 38f3532befe2c58cc11d0e055765b6098bbdd9f5
SHA1 (patch-image_h) = 5e8afa76bdd58cd747c13662e0a37fcf5a62256e
SHA1 (patch-rw_readWritePS.c) = f56b512e888821134d2f7548741a33f0f8b886fd

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.6 2005/09/07 14:10:16 adam Exp $
--- misc.h.orig 2004-09-22 14:20:24.000000000 +0000
+++ misc.h
@@ -24,7 +24,7 @@
long random(void);
#endif
-#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__)
+#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) & !defined(__NetBSD__) & !defined(__DragonFly__)
#if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS)
void srandom(unsigned int);
#else

View File

@@ -0,0 +1,20 @@
$NetBSD: patch-ab,v 1.5 2005/05/23 11:37:23 adam Exp $
--- rw/libpnmrw.c.orig 2005-05-04 14:56:24.000000000 +0000
+++ rw/libpnmrw.c
@@ -132,6 +132,7 @@ pm_freearray(char **its, int rows)
static void
pm_perror(char *reason)
{
+#if !defined(__NetBSD__)
#if defined(BSD4_4)
__const extern char *__const sys_errlist[];
#else
@@ -147,6 +148,7 @@ pm_perror(char *reason)
#endif
#endif
#endif
+#endif
char *e;
#ifdef MISSING_STRERROR

View File

@@ -0,0 +1,20 @@
$NetBSD: patch-ac,v 1.8 2005/09/06 14:53:36 adam Exp $
--- rw/rwTable.c.orig 2005-08-17 13:00:25.000000000 +0000
+++ rw/rwTable.c
@@ -251,6 +251,7 @@ RWtableGetWriterList()
char *
RWGetMsg()
{
+#ifndef __NetBSD__
#if defined(BSD4_4)
__const extern char *__const sys_errlist[];
#else
@@ -264,6 +265,7 @@ RWGetMsg()
#endif
#endif
#endif
+#endif
if (RWtableMsg[0] == '\0') {
if (errno == 0)

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-ad,v 1.9 2006/01/06 22:36:19 adam Exp $
--- configure.orig 2005-06-03 12:26:11.000000000 +0000
+++ configure
@@ -7,7 +7,7 @@ if test "$1" = "" ; then
echo "(looking for Xaw, Xaw3d, Xaw95, neXtaw)"
echo ""
else
- WIDGETS=`echo $1 | tr [a:z] [A:Z]`
+ WIDGETS=`echo $1 | tr [a-z] [A-Z]`
fi
if test "$WIDGETS" = "" ; then
@@ -55,7 +55,7 @@ if test "$WIDGETS" = "" ; then
fi
if test "$WIDGETS" = "XAW3DG" ; then
- ln -sf /usr/include/X11/Xaw3d xaw_incdir
+ ln -sf @XAWDIR@/include/X11/Xaw3d xaw_incdir
echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG"
echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG" > Local.xawdefs
echo "SYS_LIBRARIES = -lXaw3d -L."

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-ae,v 1.7 2005/05/23 11:37:23 adam Exp $
--- operation.c.orig 2005-05-06 09:46:06.000000000 +0000
+++ operation.c
@@ -1266,8 +1266,10 @@ static PaintMenuItem fontMenu[] =
fontSet, "-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*"),
MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1,
fontSet, "-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*"),
- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1,
- fontSet, "-*-fixed-medium-r-normal-*-*-120-*-*-m-*-*-*"),
+ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1,
+ fontSet, "-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1"),
+ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1,
+ fontSet, "-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1");
MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1,
fontSet, "-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*"),
MI_SEPARATOR(),

View File

@@ -0,0 +1,65 @@
$NetBSD: patch-af,v 1.13 2006/01/06 22:36:19 adam Exp $
--- Local.config.orig 2005-04-30 23:33:14.000000000 +0200
+++ Local.config
@@ -9,7 +9,7 @@ XCOMM $Id: Local.config,v 1.18 2005/03/2
XCOMM Local customization
DESTDIR =
-SHAREDIR = /usr/share/xpaint
+SHAREDIR = @PREFIX@/share/xpaint
XCOMM Printing system defaults
PRINT_COMMAND = lpr
@@ -70,6 +70,9 @@ XCOMM #endif
#ifdef NetBSDArchitecture
ARCH_DEFINES = -DHAVE_PARAM_H
+#ifdef arm32Architecture
+CDEBUGFLAGS =
+#endif
#endif
#ifdef OS2Architecture
@@ -132,11 +135,11 @@ XCOMM
XCOMM You must have the XPM library.
XCOMM Make sure the path name to the library is correct.
-XPM_LIB = -L/usr/X11R6/lib -lXpm
+XPM_LIB = -L@XPMDIR@/lib -Wl,-R@XPMDIR@/lib -lXpm
XCOMM Make sure this points to the location of the 'xpm.h' file.
-XPM_INCLUDE = -I/usr/X11R6/include/X11
+XPM_INCLUDE = -I@XPMDIR@/include/X11
DEPENDFLAGS = -I./bitmaps
@@ -162,20 +165,11 @@ XCOMM CDEBUGFLAGS =
XCOMM This should take care of everything needed for BSD.
-#if defined(NetBSDArchitecture) || defined(BSD386Architecture)
ARCH_DEFINES = -DHAVE_PARAM_H
-TIFF_INCLUDE = -I/usr/local/include
-TIFF_LIB = -L/usr/local/lib -ltiff
-JPEG_INCLUDE = -I/usr/local/include
-JPEG_LIB = -L/usr/local/lib -ljpeg
-XPM_INCLUDE = -I/usr/X11R6/include/X11
-#endif
-
-#if defined(FreeBSDArchitecture)
-ARCH_DEFINES = -DHAVE_PARAM_H
-TIFF_INCLUDE = -I/usr/local/include/tiff34
-TIFF_LIB = -L/usr/local/lib -ltiff34
-JPEG_INCLUDE = -I/usr/local/include
-JPEG_LIB = -L/usr/local/lib -ljpeg
-XPM_INCLUDE = -I/usr/X11R6/include/X11
-#endif
+TIFF_INCLUDE = -I@LOCALBASE@/include
+TIFF_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ltiff
+JPEG_INCLUDE = -I@LOCALBASE@/include
+JPEG_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -ljpeg
+PNG_INCLUDE = -I@LOCALBASE@/include/png
+PNG_LIB = -L@LOCALBASE@/lib -Wl,-R@LOCALBASE@/lib -lpng -lz
+XPM_INCLUDE = -I@XPMDIR@/include/X11

View File

@@ -0,0 +1,16 @@
$NetBSD: patch-ag,v 1.9 2011/12/15 18:49:53 marino Exp $
All shared libraries need to directly linked to satisfy default behavior of
ld v2.22
--- Imakefile.orig 2005-06-03 12:26:03.000000000 +0000
+++ Imakefile
@@ -102,7 +102,7 @@ SGI_LIB = -limage
#endif
DEPLIBS = always xpaint.man XPaint.ad
-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -lm -lX11 -lXt -lXext
SUBDIRS = rw

View File

@@ -0,0 +1,74 @@
$NetBSD: patch-ai,v 1.2 2011/07/14 09:52:59 shattered Exp $
--- graphic.c.orig 2005-09-02 21:31:56.000000000 +0000
+++ graphic.c
@@ -33,7 +33,7 @@
#include "xaw_incdir/SmeBSB.h"
#include "xaw_incdir/Paned.h"
-//#include <X11/keysym.h>
+/*#include <X11/keysym.h>*/
#include <xpm.h>
#ifdef HAVE_COLTOG
@@ -119,7 +119,8 @@ static char *fontNames[] = {
"-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Lucida 12 */
"-*-helvetica-medium-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica 12 */
"-*-helvetica-bold-r-normal-*-*-120-*-*-p-*-*-*", /* Helvetica Bold 12 */
-"-*-fixed-medium-r-normal-*-*-120-*-*-m-*-*-*", /* Fixed 12 */
+"-*-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1", /* Sony 16 */
+"-*-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1", /* Sony 24 */
"-*-courier-medium-r-normal-*-*-120-*-*-m-*-*-*" /* Courier 12 */
};
@@ -262,8 +263,9 @@ static PaintMenuItem fontMenu[] =
MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6),
MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7),
MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8),
- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9),
- MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9),
+ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11),
MI_SEPARATOR(),
MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
};
@@ -515,8 +517,9 @@ static PaintMenuItem popupFontMenu[] =
MI_FLAGCB("Lucida 12", MF_CHECK | MF_GROUP1, fontSet, 6),
MI_FLAGCB("Helvetica 12", MF_CHECK | MF_GROUP1, fontSet, 7),
MI_FLAGCB("Helvetica Bold 12", MF_CHECK | MF_GROUP1, fontSet, 8),
- MI_FLAGCB("Fixed 12", MF_CHECK | MF_GROUP1, fontSet, 9),
- MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Sony 16", MF_CHECK | MF_GROUP1, fontSet, 9),
+ MI_FLAGCB("Sony 24", MF_CHECK | MF_GROUP1, fontSet, 10),
+ MI_FLAGCB("Courier 12", MF_CHECK | MF_GROUP1, fontSet, 11),
MI_SEPARATOR(),
MI_FLAGCB("select", MF_CHECK | MF_GROUP1, fontSet, NULL),
};
@@ -3606,7 +3609,7 @@ graphicCreate(Widget shell, int width, i
#endif
}
}
- //checkPaintDimension(shell);
+ /*checkPaintDimension(shell);*/
return paint;
}
@@ -4145,7 +4148,7 @@ stdPasteCB(Widget paint, XtPointer infoA
PwRegionSet(paint, &rect, pix, newMask);
}
- // setToSelectOp();
+ /* setToSelectOp();*/
}
void
@@ -4282,7 +4285,7 @@ StdSelectAllCallback(Widget w, XtPointer
rect.height = dh;
PwRegionSet(paint, &rect, None, None);
- // setToSelectOp();
+ /* setToSelectOp(); */
}
void

View File

@@ -0,0 +1,16 @@
$NetBSD: patch-image_h,v 1.1 2011/12/16 05:14:27 dholland Exp $
Yet another package that thinks it's a good idea to conditionalize on
someone else's include guards beyond its control...
--- image.h~ 2005-03-20 20:15:32.000000000 +0000
+++ image.h
@@ -63,7 +63,7 @@ typedef struct {
unsigned long sourceMask;
} Image;
-#ifdef _XLIB_H_
+#if defined(_XLIB_H_) || defined(_X11_XLIB_H_)
/* Used to transfer information to routines in iprocess.c */
struct imageprocessinfo {
int oilArea;

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-rw_readWritePS.c,v 1.1 2012/10/24 15:38:43 joerg Exp $
--- rw/readWritePS.c.orig 2012-10-24 12:51:26.000000000 +0000
+++ rw/readWritePS.c
@@ -383,7 +383,7 @@ ReadPS(char *file)
fclose(fp);
type_doc = TestPS(file);
- if (!type_doc) return; /* should not happen anyway ... */
+ if (!type_doc) return NULL; /* should not happen anyway ... */
strncpy(rad, file, 256),
rad[256] = '\0';