cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SHARED_LIBS, sync with update-patches

Browse Source 
ok naddy@
This commit is contained in:
steven 2005-12-29 15:45:42 +00:00
parent 5674966f63
commit 81de9b78db
8 changed files with 87 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/netpbm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2005/10/30 00:10:41 fgsch Exp $
# $OpenBSD: Makefile,v 1.36 2005/12/29 15:45:42 steven Exp $
# $NetBSD: Makefile,v 1.25 1999/03/04 14:18:54 tron Exp $
COMMENT= "toolkit for converting images between different formats"
@ -8,6 +8,11 @@ VERSION= 9.24
DISTNAME= netpbm-${VERSION}
PKGNAME= ${DISTNAME}p3
PKGNAME-hpcd= hpcdtoppm-${VERSION}p1
SHARED_LIBS= pbm 1.0 \
pgm 1.0 \
pnm 1.0 \
ppm 1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/}
EXTRACT_SUFX= .tgz
@ -32,7 +37,11 @@ WANTLIB+= m z
PERMIT_PACKAGE_CDROM= Yes
.endif
MAKE_FLAGS= CC="${CC}"
MAKE_FLAGS= CC="${CC}" \
LIBpbm_VERSION=${LIBpbm_VERSION} \
LIBpgm_VERSION=${LIBpgm_VERSION} \
LIBpnm_VERSION=${LIBpnm_VERSION} \
LIBppm_VERSION=${LIBppm_VERSION}
FAKE_FLAGS= ${MAKE_FLAGS} PREFIX="${WRKINST}${TRUEPREFIX}"
# gcc3 ICE on exif.c

25
graphics/netpbm/patches/patch-Makefile_common
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
--- Makefile.common.orig Sun Jan 27 15:09:03 2002
+++ Makefile.common Fri Mar 1 17:23:32 2002
@@ -176,25 +176,21 @@ $(MERGENAME): $(MERGENAME).o $(MERGE_OBJ
$OpenBSD: patch-Makefile_common,v 1.3 2005/12/29 15:45:43 steven Exp $
--- Makefile.common.orig Sun Jan 27 21:09:03 2002
+++ Makefile.common Thu Dec 29 15:53:24 2005
@@ -176,25 +176,24 @@ $(MERGENAME): $(MERGENAME).o $(MERGE_OBJ
$(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
# Note that the user may have configured -I options into CFLAGS.
@ -27,7 +27,10 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
- $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG)
+lib$(LIBROOT).$(NETPBMLIBSUFFIX): lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(SOVER)
+libpbm.$(NETPBMLIBSUFFIX): libpbm.$(NETPBMLIBSUFFIX).$(LIBpbm_VERSION)
+libpgm.$(NETPBMLIBSUFFIX): libpgm.$(NETPBMLIBSUFFIX).$(LIBpgm_VERSION)
+libpnm.$(NETPBMLIBSUFFIX): libpnm.$(NETPBMLIBSUFFIX).$(LIBpnm_VERSION)
+libppm.$(NETPBMLIBSUFFIX): libppm.$(NETPBMLIBSUFFIX).$(LIBppm_VERSION)
+
+lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(SOVER): \
+ $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
@ -36,7 +39,7 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
endif
ifeq ($(NETPBMLIBTYPE),dll)
@@ -283,7 +279,7 @@ endif
@@ -283,7 +282,7 @@ endif
install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
ifneq ($(MERGENAME)x,x)
@ -45,7 +48,7 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
$(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
@@ -293,7 +289,7 @@ endif
@@ -293,7 +292,7 @@ endif
ifneq ($(NOMERGEBINARIES)x,x)
for x in $(NOMERGEBINARIES); \
do \
@ -54,7 +57,7 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
$$x $(INSTALLBINARIES); \
done
endif
@@ -304,7 +300,7 @@ install.bin.common: $(BINARIES) install.
@@ -304,7 +303,7 @@ install.bin.common: $(BINARIES) install.
# Make and Install know that pbmmake.exe counts as pbmmake.
for x in $(BINARIES); \
do \
@ -63,7 +66,7 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
$$x $(INSTALLBINARIES); \
done
@@ -313,7 +309,7 @@ install.script: $(SCRIPTS)
@@ -313,7 +312,7 @@ install.script: $(SCRIPTS)
ifneq ($(SCRIPTS)x,x)
for x in $(SCRIPTS); \
do \
@ -72,7 +75,7 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
$(INSTALLSCRIPTS); \
done
endif
@@ -350,7 +346,7 @@ install.hdr:
@@ -350,7 +349,7 @@ install.hdr:
# directory when you compile your programs.
for x in $(INTERFACE_HEADERS); \
do \
@ -81,7 +84,7 @@ $OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
$(INSTALLHDRS); \
done
@@ -358,36 +354,19 @@ install.hdr:
@@ -358,36 +357,19 @@ install.hdr:
#
.PHONY: install.staticlib
install.staticlib: lib$(LIBROOT).$(STATICLIBSUFFIX)

18
graphics/netpbm/patches/patch-pbm_Makefile
View File

@ -1,6 +1,14 @@
--- pbm/Makefile.orig Thu Jan 10 18:19:44 2002
+++ pbm/Makefile Fri Mar 1 16:03:29 2002
@@ -52,6 +52,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
--- pbm/Makefile.orig Fri Jan 11 00:19:44 2002
+++ pbm/Makefile Thu Dec 29 15:48:07 2005
@@ -4,6 +4,7 @@ BUILDDIR = ..
include $(BUILDDIR)/Makefile.config
+SOVER=$(LIBpbm_VERSION)
INCLUDE = -I$(SRCDIR)/shhopt
@@ -52,6 +53,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
# Library objects to be built and linked by Makefile.common:
LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
@ -8,7 +16,7 @@
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
@@ -68,26 +69,21 @@ INTERFACE_HEADERS = pm.h pbm.h
@@ -68,26 +70,21 @@ INTERFACE_HEADERS = pm.h pbm.h
.PHONY: all
all: $(LIBPBM) $(BINARIES) $(EXTRA_STATICLIB)
@ -36,7 +44,7 @@
HEADERLINKS = pm_config.h version.h compile.h
@@ -110,6 +106,5 @@ $(BUILDDIR)/shhopt/libshhopt.a:
@@ -110,6 +107,5 @@ $(BUILDDIR)/shhopt/libshhopt.a:
clean: clean.common
rm -f thinkjettopbm.c
rm -f compile.h

9
graphics/netpbm/patches/patch-pbm_libpm_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pbm_libpm_c,v 1.1 2003/03/29 04:13:54 brad Exp $
--- pbm/libpm.c.orig Fri Jan 25 19:18:05 2002
+++ pbm/libpm.c Fri Mar 28 20:22:07 2003
$OpenBSD: patch-pbm_libpm_c,v 1.2 2005/12/29 15:45:43 steven Exp $
--- pbm/libpm.c.orig Sat Jan 26 01:18:05 2002
+++ pbm/libpm.c Thu Dec 29 15:42:05 2005
@@ -14,6 +14,7 @@
**************************************************************************/
@ -50,7 +50,6 @@ $OpenBSD: patch-pbm_libpm_c,v 1.1 2003/03/29 04:13:54 brad Exp $
}
-
+/*
+ * Maths wrapping
+ */
@ -64,7 +63,7 @@ $OpenBSD: patch-pbm_libpm_c,v 1.1 2003/03/29 04:13:54 brad Exp $
+ if(a > INT_MAX / b)
+ pm_error("object too large");
+}
+
+void overflow3(int a, int b, int c)
+{
+ overflow2(a,b);

17
graphics/netpbm/patches/patch-pgm_Makefile
View File

@ -1,6 +1,15 @@
--- pgm/Makefile.orig Mon Sep 10 22:35:08 2001
+++ pgm/Makefile Mon Sep 10 22:40:52 2001
@@ -33,6 +33,7 @@ MERGEBINARIES = $(BINARIES)
--- pgm/Makefile.orig Sat Sep 8 21:31:29 2001
+++ pgm/Makefile Thu Dec 29 15:48:45 2005
@@ -2,6 +2,8 @@ SRCDIR = ..
BUILDDIR = ..
include $(BUILDDIR)/Makefile.config
+SOVER=$(LIBpgm_VERSION)
+
LIBROOT = pgm
LIBPGM = $(NETPBMSHLIBPREFIX)$(LIBROOT).$(NETPBMLIBSUFFIX)
MAJ = 9
@@ -33,6 +35,7 @@ MERGEBINARIES = $(BINARIES)
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpgm1.o libpgm2.o
@ -8,7 +17,7 @@
MANUALS1 = $(BINARIES)
MANUALS3 = libpgm
@@ -45,7 +46,7 @@ INTERFACE_HEADERS = pgm.h
@@ -45,7 +48,7 @@ INTERFACE_HEADERS = pgm.h
.PHONY: all
all: $(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)
.PHONY: merge

17
graphics/netpbm/patches/patch-pnm_Makefile
View File

@ -1,6 +1,15 @@
--- pnm/Makefile.orig Sun Jan 20 18:17:29 2002
+++ pnm/Makefile Fri Mar 1 16:38:56 2002
@@ -146,13 +146,14 @@ SCRIPTS = anytopnm pamstretch-gen pnmind
--- pnm/Makefile.orig Mon Jan 21 00:17:29 2002
+++ pnm/Makefile Thu Dec 29 15:49:33 2005
@@ -2,6 +2,8 @@ SRCDIR = ..
BUILDDIR = ..
include $(BUILDDIR)/Makefile.config
+SOVER=$(LIBpnm_VERSION)
+
LIBROOT = pnm
LIBPNM = $(NETPBMSHLIBPREFIX)$(LIBROOT).$(NETPBMLIBSUFFIX)
MAJ = 9
@@ -146,13 +148,14 @@ SCRIPTS = anytopnm pamstretch-gen pnmind
# MERGE_ALIASES is additional names to be linked to the merge binary which are
# alternate names for a program whose source is called something else.
# Every name here must be referenced in pnmmerge.c.
@ -16,7 +25,7 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
@@ -170,7 +171,7 @@ endif
@@ -170,7 +173,7 @@ endif
$(MAKE) -C jbig all
$(MAKE) -C pnmtopalm all
PHONY: merge

19
graphics/netpbm/patches/patch-ppm_Makefile
View File

@ -1,6 +1,15 @@
--- ppm/Makefile.orig Sun Jan 6 17:04:08 2002
+++ ppm/Makefile Fri Mar 1 16:08:43 2002
@@ -74,6 +74,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
--- ppm/Makefile.orig Sun Jan 6 23:04:08 2002
+++ ppm/Makefile Thu Dec 29 15:48:31 2005
@@ -2,6 +2,8 @@ SRCDIR = ..
BUILDDIR = ..
include $(BUILDDIR)/Makefile.config
+SOVER=$(LIBppm_VERSION)
+
LIBROOT = ppm
LIBPPM = $(NETPBMSHLIBPREFIX)$(LIBROOT).$(NETPBMLIBSUFFIX)
MAJ = 9
@@ -74,6 +76,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
libppmfloyd.o bitio.o
@ -8,7 +17,7 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libppm
@@ -81,7 +82,7 @@ MANUALS5 = ppm
@@ -81,7 +84,7 @@ MANUALS5 = ppm
MERGENAME= ppmmerge
@ -17,7 +26,7 @@
ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)
$(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \
@@ -92,7 +93,7 @@ all: $(LIBPPM) $(BINARIES) $(EXTRA_STATI
@@ -92,7 +95,7 @@ all: $(LIBPPM) $(BINARIES) $(EXTRA_STATI
$(MAKE) -C ppmtompeg all
$(MAKE) -C hpcdtoppm all
.PHONY: merge

10
graphics/netpbm/pkg/PFRAG.shared
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 00:50:10 espie Exp $
@lib lib/libpbm.so.1.0
@lib lib/libpgm.so.1.0
@lib lib/libpnm.so.1.0
@lib lib/libppm.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/29 15:45:43 steven Exp $
@lib lib/libpbm.so.${LIBpbm_VERSION}
@lib lib/libpgm.so.${LIBpgm_VERSION}
@lib lib/libpnm.so.${LIBpnm_VERSION}
@lib lib/libppm.so.${LIBppm_VERSION}