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

SHARED_LIBS, sync with update-patches

Browse Source
This commit is contained in:
steven 2005-12-30 23:25:56 +00:00
parent c48fee8d7a
commit 4a9b8373a0
4 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/xnc/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2004/12/22 11:50:30 alek Exp $
# $OpenBSD: Makefile,v 1.14 2005/12/30 23:25:56 steven Exp $
COMMENT= "filemanager for X Window"
DISTNAME= xnc-4.4.7
DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
SHARED_LIBS= xncaqua 0.0 \
xncfive 0.0
CATEGORIES= misc x11
MAINTAINER= Reinhard J. Sammer <reinhard@openbsd.org>
@ -32,6 +35,10 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/l
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-x
FAKE_FLAGS= LIBxncaqua_VERSION=${LIBxncaqua_VERSION} \
LIBxncfive_VERSION=${LIBxncfive_VERSION} \
DESTDIR=${WRKINST}
XNLAUNCHFILES= .launch.menu .xnlaunch.ini graphs.gif ives.gif kill.gif \
map.gif netscape.gif term.gif tnet.gif

10
misc/xnc/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.5 2003/03/05 22:48:08 pvalchev Exp $
--- Makefile.in.orig Wed Mar 27 05:16:28 2002
+++ Makefile.in Wed Mar 5 15:30:36 2003
$OpenBSD: patch-Makefile_in,v 1.6 2005/12/30 23:25:56 steven Exp $
--- Makefile.in.orig Wed Mar 27 13:16:28 2002
+++ Makefile.in Sat Dec 31 00:15:44 2005
@@ -268,19 +268,19 @@ install: install-$(PLUGINS)
$(INSM) ./yo-man/*.1 $(INSTMAN)/man1
$(INS) ./ives/ives $(INSTDIR)
@ -21,8 +21,8 @@ $OpenBSD: patch-Makefile_in,v 1.5 2003/03/05 22:48:08 pvalchev Exp $
mkdir -p $(INSTPLUG)
- $(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
- $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
+ $(INS) ./plugins/five/libxncfive.so $(INSTPLUG)/libxncfive.so.0.0
+ $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)/libxncaqua.so.0.0
+ $(INS) ./plugins/five/libxncfive.so $(INSTPLUG)/libxncfive.so.$(LIBxncfive_VERSION)
+ $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)/libxncaqua.so.$(LIBxncaqua_VERSION)
install-:
@echo "Skipping..."

25
misc/xnc/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1 2003/12/26 19:34:23 naddy Exp $
--- configure.in.orig 2002-03-27 16:59:52.000000000 +0100
+++ configure.in 2003-12-26 18:25:42.000000000 +0100
@@ -198,20 +198,6 @@ AC_CHECK_LIB(jpeg, jpeg_read_scanlines,
$OpenBSD: patch-configure_in,v 1.2 2005/12/30 23:25:56 steven Exp $
--- configure.in.orig Wed Mar 27 16:59:52 2002
+++ configure.in Sat Dec 31 00:06:10 2005
@@ -198,21 +198,7 @@ AC_CHECK_LIB(jpeg, jpeg_read_scanlines,
need_jpeg="yes"
])
@ -18,14 +18,17 @@ $OpenBSD: patch-configure_in,v 1.1 2003/12/26 19:34:23 naddy Exp $
- echo "TIFFDEFINE=" >>make.conf
- echo "TIFFINC=" >> make.conf
-])
-
-
AC_CHECK_LIB(z, inflate,
[
@@ -227,6 +213,21 @@ AC_CHECK_LIB(z, inflate,
echo "ZINC=" >>make.conf
@@ -225,6 +211,21 @@ AC_CHECK_LIB(z, inflate,
echo "ZLIB=`pwd`/zlib/libz.a" >>make.conf
echo "ZDEP=../zlib/libz.a" >>make.conf
])
+
+
+AC_CHECK_LIB(tiff, TIFFGetField,
+[
+ out_lib="$out_lib -ltiff -ljpeg"
@ -39,8 +42,6 @@ $OpenBSD: patch-configure_in,v 1.1 2003/12/26 19:34:23 naddy Exp $
+ echo "TIFFDEFINE=" >>make.conf
+ echo "TIFFINC=" >> make.conf
+], -ljpeg -lz)
+
+
AC_CHECK_LIB(png, png_get_valid,
[
echo "PNGDEFINE=-DLOAD_PNG" >>make.conf

6
misc/xnc/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 17:54:17 espie Exp $
@lib lib/xnc/libxncaqua.so.0.0
@lib lib/xnc/libxncfive.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/30 23:25:57 steven Exp $
@lib lib/xnc/libxncaqua.so.${LIBxncaqua_VERSION}
@lib lib/xnc/libxncfive.so.${LIBxncfive_VERSION}