Convert gimp1's library to elf, and activate xdelta plugin.

12 files changed, 54 insertions, 30 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 82e0340c06b6..7a3f8f057327 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
+# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
-#LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
+LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -42,5 +42,6 @@ post-install:
 	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index a325be483c6b..923254e6f3e4 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -18,17 +18,19 @@ include/libgimp/gimpui.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.1.0
+lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1.0
+lib/libgimp.so.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1
 lib/libgpc.a
 lib/libmegawidget.a
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.0/plug-ins/AlienMap
 libexec/gimp/1.0/plug-ins/CEL
 libexec/gimp/1.0/plug-ins/CML_explorer
@@ -149,6 +151,7 @@ libexec/gimp/1.0/plug-ins/vpropagate
 libexec/gimp/1.0/plug-ins/waves
 libexec/gimp/1.0/plug-ins/webbrowser
 libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xd
 libexec/gimp/1.0/plug-ins/xpm
 libexec/gimp/1.0/plug-ins/xwd
 libexec/gimp/1.0/plug-ins/zealouscrop
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 82e0340c06b6..7a3f8f057327 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
+# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
-#LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
+LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -42,5 +42,6 @@ post-install:
 	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index a325be483c6b..923254e6f3e4 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -18,17 +18,19 @@ include/libgimp/gimpui.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.1.0
+lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1.0
+lib/libgimp.so.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1
 lib/libgpc.a
 lib/libmegawidget.a
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.0/plug-ins/AlienMap
 libexec/gimp/1.0/plug-ins/CEL
 libexec/gimp/1.0/plug-ins/CML_explorer
@@ -149,6 +151,7 @@ libexec/gimp/1.0/plug-ins/vpropagate
 libexec/gimp/1.0/plug-ins/waves
 libexec/gimp/1.0/plug-ins/webbrowser
 libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xd
 libexec/gimp/1.0/plug-ins/xpm
 libexec/gimp/1.0/plug-ins/xwd
 libexec/gimp/1.0/plug-ins/zealouscrop
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 82e0340c06b6..7a3f8f057327 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
+# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
-#LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
+LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -42,5 +42,6 @@ post-install:
 	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index a325be483c6b..923254e6f3e4 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -18,17 +18,19 @@ include/libgimp/gimpui.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.1.0
+lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1.0
+lib/libgimp.so.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1
 lib/libgpc.a
 lib/libmegawidget.a
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.0/plug-ins/AlienMap
 libexec/gimp/1.0/plug-ins/CEL
 libexec/gimp/1.0/plug-ins/CML_explorer
@@ -149,6 +151,7 @@ libexec/gimp/1.0/plug-ins/vpropagate
 libexec/gimp/1.0/plug-ins/waves
 libexec/gimp/1.0/plug-ins/webbrowser
 libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xd
 libexec/gimp/1.0/plug-ins/xpm
 libexec/gimp/1.0/plug-ins/xwd
 libexec/gimp/1.0/plug-ins/zealouscrop
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 82e0340c06b6..7a3f8f057327 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
+# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
-#LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
+LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -42,5 +42,6 @@ post-install:
 	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index a325be483c6b..923254e6f3e4 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -18,17 +18,19 @@ include/libgimp/gimpui.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.1.0
+lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1.0
+lib/libgimp.so.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1
 lib/libgpc.a
 lib/libmegawidget.a
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.0/plug-ins/AlienMap
 libexec/gimp/1.0/plug-ins/CEL
 libexec/gimp/1.0/plug-ins/CML_explorer
@@ -149,6 +151,7 @@ libexec/gimp/1.0/plug-ins/vpropagate
 libexec/gimp/1.0/plug-ins/waves
 libexec/gimp/1.0/plug-ins/webbrowser
 libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xd
 libexec/gimp/1.0/plug-ins/xpm
 libexec/gimp/1.0/plug-ins/xwd
 libexec/gimp/1.0/plug-ins/zealouscrop
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 82e0340c06b6..7a3f8f057327 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
+# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
-#LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
+LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -42,5 +42,6 @@ post-install:
 	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index a325be483c6b..923254e6f3e4 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -18,17 +18,19 @@ include/libgimp/gimpui.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.1.0
+lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1.0
+lib/libgimp.so.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1
 lib/libgpc.a
 lib/libmegawidget.a
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.0/plug-ins/AlienMap
 libexec/gimp/1.0/plug-ins/CEL
 libexec/gimp/1.0/plug-ins/CML_explorer
@@ -149,6 +151,7 @@ libexec/gimp/1.0/plug-ins/vpropagate
 libexec/gimp/1.0/plug-ins/waves
 libexec/gimp/1.0/plug-ins/webbrowser
 libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xd
 libexec/gimp/1.0/plug-ins/xpm
 libexec/gimp/1.0/plug-ins/xwd
 libexec/gimp/1.0/plug-ins/zealouscrop
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 82e0340c06b6..7a3f8f057327 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
+# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
-#LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
+LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -42,5 +42,6 @@ post-install:
 	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index a325be483c6b..923254e6f3e4 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -18,17 +18,19 @@ include/libgimp/gimpui.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.1.0
+lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1.0
+lib/libgimp.so.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1
 lib/libgpc.a
 lib/libmegawidget.a
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.0/plug-ins/AlienMap
 libexec/gimp/1.0/plug-ins/CEL
 libexec/gimp/1.0/plug-ins/CML_explorer
@@ -149,6 +151,7 @@ libexec/gimp/1.0/plug-ins/vpropagate
 libexec/gimp/1.0/plug-ins/waves
 libexec/gimp/1.0/plug-ins/webbrowser
 libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xd
 libexec/gimp/1.0/plug-ins/xpm
 libexec/gimp/1.0/plug-ins/xwd
 libexec/gimp/1.0/plug-ins/zealouscrop