Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 May 1999 01:24:20 +0200 (SAT)
From:      reg@shale.csir.co.za
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/11843: Port change: graphics/imlib
Message-ID:  <199905222324.BAA48917@shale.csir.co.za>

next in thread | raw e-mail | index | archive | help

>Number:         11843
>Category:       ports
>Synopsis:       Port change: graphics/imlib
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 22 16:30:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Lea
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:

	FreeBSD Ports collection.

>Description:

	Bump imlib's shared lib version, since GTK+'s was bumped.  Update
	dependencies.

	USE_LIBTOOL.

	Forgot to mention:  GTK+ now always links with -lxpg4, so all the
	ports which depend on it don't need to...

>How-To-Repeat:

	

>Fix:
	
	
audio/gqmpeg:
  Changes: Makefile
  Adds   :
  Removes:

graphics/fnlib:
  Changes: Makefile pkg/PLIST
  Adds   :
  Removes: patches/patch-ad

graphics/gqview:
  Changes: Makefile
  Adds   :
  Removes:

graphics/gview:
  Changes: Makefile
  Adds   :
  Removes:

graphics/imlib:
  Changes: Makefile patches/patch-ac pkg/PLIST
  Adds   :
  Removes: patches/patch-ae patches/patch-af

graphics/qiv:
  Changes: Makefile
  Adds   :
  Removes:

japanese/eterm:
  Changes: Makefile
  Adds   :
  Removes:

x11-toolkits/gtk-engines:
  Changes: Makefile pkg/PLIST
  Adds   :
  Removes: patches/patch-aa

x11-wm/enlightenment:
  Changes: Makefile
  Adds   :
  Removes: files/patch-xlocale

x11/eterm:
  Changes: Makefile patches/patch-aa pkg/PLIST
  Adds   :
  Removes:

--- /usr/ports.ref/audio/gqmpeg/Makefile	Mon May 17 23:41:10 1999
+++ audio/gqmpeg/Makefile	Tue May 18 00:15:06 1999
@@ -15,7 +15,7 @@
 MAINTAINER=	nacai@iname.com
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_X_PREFIX=	yes
 ALL_TARGET=	gqmpeg

--- /usr/ports.ref/graphics/fnlib/Makefile	Wed Mar 17 12:44:21 1999
+++ graphics/fnlib/Makefile	Sat May 15 17:38:24 1999
@@ -8,22 +8,17 @@
 
 DISTNAME=	fnlib-0.4
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	enlightenment
-#MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
-#		ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
-#		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
+MASTER_SITES=	ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
+		ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
+		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
--- /usr/ports.ref/graphics/fnlib/patches/patch-ad	Sun Jan 31 22:53:52 1999
+++ graphics/fnlib/patches/patch-ad	Sat May 15 17:38:34 1999
@@ -1,53 +0,0 @@
---- ltmain.sh.orig	Tue Dec 15 03:52:56 1998
-+++ ltmain.sh	Mon Feb  1 04:08:35 1999
-@@ -923,6 +923,16 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+        versuffix="$current"
-+	else
-+        versuffix="$current.$revision"
-+	fi
-+        ;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig	Tue Dec 15 03:52:56 1998
-+++ ltconfig	Mon Feb  1 04:09:01 1999
-@@ -767,7 +767,7 @@
-     ;;
- 
-   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
--  freebsd3*)
-+  freebsd*)
-     archive_cmds='$CC -shared -o $lib$libobjs'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-@@ -1105,10 +1105,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-   ;;
- 
--freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='$libname.so.$versuffix $libname.so'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd*)
-+  version_type=freebsd
-+  library_names_spec='$libname.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--- /usr/ports.ref/graphics/fnlib/pkg/PLIST	Mon Dec 28 02:35:53 1998
+++ graphics/fnlib/pkg/PLIST	Sat May 15 17:39:02 1999
@@ -2,7 +2,6 @@
 include/Fnlib.h
 include/Fnlib_types.h
 lib/libFnlib.a
-lib/libFnlib.la
 lib/libFnlib.so
 lib/libFnlib.so.0.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R

--- /usr/ports.ref/graphics/gqview/Makefile	Wed Mar 17 12:44:31 1999
+++ graphics/gqview/Makefile	Fri Apr 30 00:58:11 1999
@@ -14,15 +14,16 @@
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		Imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 ALL_TARGET=	gqview
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
-
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 pre-install:
 .if !defined(NOPORTDOCS)

--- /usr/ports.ref/graphics/gview/Makefile	Mon May  3 06:21:32 1999
+++ graphics/gview/Makefile	Fri May 14 11:09:41 1999
@@ -12,16 +12,14 @@
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	gdk_imlib:${PORTSDIR}/graphics/imlib \
-		gdk12:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12:${PORTSDIR}/devel/glib12 \
-		gmodule12:${PORTSDIR}/devel/glib12 \
-		gtk12:${PORTSDIR}/x11-toolkits/gtk12 \
-		intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib \
+		intl.1:${PORTSDIR}/devel/gettext
+
+GTK_CONFIG?=	${X11BASE}/gtk12-config
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 post-install:
 .if !defined(NOPORTDOCS)

--- /usr/ports.ref/graphics/imlib/Makefile	Thu Apr  8 22:33:16 1999
+++ graphics/imlib/Makefile	Tue May 11 13:55:00 1999
@@ -17,25 +17,17 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/giflib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	@${ECHO} '************************************************************'
-	@${ECHO} '*                                                          *'
-	@${ECHO} '*     If you want to use autoconf with imlib,              *'
-	@${ECHO} '*     Please copy imlib.m4 to /usr/local/share/aclocal     *'
-	@${ECHO} '*     by yourself, thanks.                                 *'
-	@${ECHO} '*                                                          *'
-	@${ECHO} '************************************************************'
 
 .include <bsd.port.mk>
--- /usr/ports.ref/graphics/imlib/patches/patch-ac	Wed Mar 17 12:44:37 1999
+++ graphics/imlib/patches/patch-ac	Fri Apr 30 00:28:09 1999
@@ -5,7 +5,7 @@
  
  
 -libImlib_la_LDFLAGS = -version-info 10:4:9
-+libImlib_la_LDFLAGS = -version-info 3:0:0
++libImlib_la_LDFLAGS = -version-info 4:0:0
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
  libImlib_la_LIBADD = $(SUPPORT_LIBS)
  
@@ -16,7 +16,7 @@
  
  
 -libgdk_imlib_la_LDFLAGS = -version-info 10:4:9
-+libgdk_imlib_la_LDFLAGS = -version-info 3:0:0
++libgdk_imlib_la_LDFLAGS = -version-info 4:0:0
  libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
  
  include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
--- /usr/ports.ref/graphics/imlib/patches/patch-ae	Tue Mar  9 12:38:50 1999
+++ graphics/imlib/patches/patch-ae	Tue May 11 13:44:17 1999
@@ -1,11 +0,0 @@
---- ltconfig.orig	Wed Feb 24 17:46:26 1999
-+++ ltconfig	Mon Mar  1 19:57:31 1999
-@@ -1683,7 +1683,7 @@
-       deplibs_check_method=unknown
-       ;;
-   esac
--  library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
-   finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   need_version=yes
--- /usr/ports.ref/graphics/imlib/patches/patch-af	Thu Feb 18 13:42:52 1999
+++ graphics/imlib/patches/patch-af	Thu Apr  8 22:29:47 1999
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Feb 12 14:29:09 1999
-+++ Makefile.in	Wed Feb 17 22:15:23 1999
-@@ -372,7 +372,7 @@
- install-data: install-data-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install: install-recursive
- uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
- uninstall: uninstall-recursive
--- /usr/ports.ref/graphics/imlib/pkg/PLIST	Wed Mar 17 12:44:38 1999
+++ graphics/imlib/pkg/PLIST	Tue May 11 14:19:36 1999
@@ -9,45 +9,37 @@
 include/gdk_imlib_private.h
 include/gdk_imlib_types.h
 lib/libImlib.a
-lib/libImlib.la
 lib/libImlib.so
-lib/libImlib.so.3.0
+lib/libImlib.so.4
 lib/libgdk_imlib.a
-lib/libgdk_imlib.la
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.3.0
+lib/libgdk_imlib.so.4
 lib/libimlib-bmp.a
-lib/libimlib-bmp.la
 lib/libimlib-bmp.so
 lib/libimlib-bmp.so.0
 lib/libimlib-gif.a
-lib/libimlib-gif.la
 lib/libimlib-gif.so
 lib/libimlib-gif.so.0
 lib/libimlib-jpeg.a
-lib/libimlib-jpeg.la
 lib/libimlib-jpeg.so
 lib/libimlib-jpeg.so.0
 lib/libimlib-png.a
-lib/libimlib-png.la
 lib/libimlib-png.so
 lib/libimlib-png.so.0
 lib/libimlib-ppm.a
-lib/libimlib-ppm.la
 lib/libimlib-ppm.so
 lib/libimlib-ppm.so.0
 lib/libimlib-ps.a
-lib/libimlib-ps.la
 lib/libimlib-ps.so
 lib/libimlib-ps.so.0
 lib/libimlib-tiff.a
-lib/libimlib-tiff.la
 lib/libimlib-tiff.so
 lib/libimlib-tiff.so.0
 lib/libimlib-xpm.a
-lib/libimlib-xpm.la
 lib/libimlib-xpm.so
 lib/libimlib-xpm.so.0
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/imlib.m4
 @dirrm etc/imlib
+@unexec rmdir %D/share/aclocal 2>/dev/null || true

--- /usr/ports.ref/graphics/qiv/Makefile	Thu Apr 22 14:44:38 1999
+++ graphics/qiv/Makefile	Fri Apr 30 01:49:54 1999
@@ -15,20 +15,17 @@
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
-BUILD_DEPENDS=	imlib-config:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_X_PREFIX=	yes
 MAN1=		qiv.1
 
 post-patch:
-
 	@ ${MV} ${WRKSRC}/qiv.1 ${WRKSRC}/qiv.1.pre_sed
 	@ ${SED} -e 's#\/usr\/bin#${PREFIX}/bin#g' \
 	${WRKSRC}/qiv.1.pre_sed > ${WRKSRC}/qiv.1
 
 do-install:
-
 	${INSTALL_PROGRAM} ${WRKSRC}/qiv ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/qiv.1 ${PREFIX}/man/man1/
 

--- /usr/ports.ref/japanese/eterm/Makefile	Sun May  9 22:46:54 1999
+++ japanese/eterm/Makefile	Sun May  9 23:12:15 1999
@@ -17,7 +17,7 @@
 
 MAINTAINER=	nobutaka@nobutaka.com
 
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes

--- /usr/ports.ref/x11-toolkits/gtk-engines/Makefile	Thu Apr  8 22:48:14 1999
+++ x11-toolkits/gtk-engines/Makefile	Wed May 12 09:17:14 1999
@@ -13,11 +13,13 @@
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
@@ -27,8 +29,5 @@
 		${MV} gtkrc gtkrc.tmp; \
 		${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \
 	done
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
--- /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-aa	Tue Mar  9 12:52:05 1999
+++ x11-toolkits/gtk-engines/patches/patch-aa	Wed May 12 09:17:26 1999
@@ -1,11 +0,0 @@
---- ltconfig.orig	Wed Feb 17 01:49:26 1999
-+++ ltconfig	Wed Feb 17 01:49:58 1999
-@@ -1683,7 +1683,7 @@
-       deplibs_check_method=unknown
-       ;;
-   esac
--  library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+  library_names_spec='${libname}.so$versuffix $libname.so'
-   finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   need_version=yes
--- /usr/ports.ref/x11-toolkits/gtk-engines/pkg/PLIST	Tue Mar  9 12:52:05 1999
+++ x11-toolkits/gtk-engines/pkg/PLIST	Wed May 12 09:20:40 1999
@@ -79,23 +79,15 @@
 share/themes/Redmond95/ICON.png
 share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk/gtkrc
-share/themes/engines/libmetal.la
 share/themes/engines/libmetal.so
-share/themes/engines/libmetal.so.0
-share/themes/engines/libnotif.la
 share/themes/engines/libnotif.so
-share/themes/engines/libnotif.so.0
-share/themes/engines/libpixmap.la
 share/themes/engines/libpixmap.so
-share/themes/engines/libpixmap.so.0
-share/themes/engines/libredmond95.la
 share/themes/engines/libredmond95.so
-share/themes/engines/libredmond95.so.0
-@dirrm share/themes/Metal/gtk
-@dirrm share/themes/Metal
-@dirrm share/themes/Notif/gtk
-@dirrm share/themes/Notif
-@dirrm share/themes/Pixmap/gtk
-@dirrm share/themes/Pixmap
 @dirrm share/themes/Redmond95/gtk
 @dirrm share/themes/Redmond95
+@dirrm share/themes/Pixmap/gtk
+@dirrm share/themes/Pixmap
+@dirrm share/themes/Notif/gtk
+@dirrm share/themes/Notif
+@dirrm share/themes/Metal/gtk
+@dirrm share/themes/Metal

--- /usr/ports.ref/x11-wm/enlightenment/Makefile	Mon Apr 19 10:59:46 1999
+++ x11-wm/enlightenment/Makefile	Fri May 14 11:17:36 1999
@@ -12,13 +12,12 @@
 		http://www.rasterman.com/files/ \
 		ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
 
-
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	esd.1:${PORTSDIR}/audio/esound \
 		Fnlib.0:${PORTSDIR}/graphics/fnlib \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		Imlib.3:${PORTSDIR}/graphics/imlib \
+		Imlib.4:${PORTSDIR}/graphics/imlib \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		ttf.3:${PORTSDIR}/print/freetype \
 		ghttp.1:${PORTSDIR}/www/libghttp
@@ -28,6 +27,6 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>

--- /usr/ports.ref/x11/eterm/Makefile	Wed Mar 17 12:56:36 1999
+++ x11/eterm/Makefile	Mon May 10 18:36:06 1999
@@ -17,13 +17,12 @@
 
 MAINTAINER=	murray@cdrom.com
 
-BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	Imlib.3:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib.4:${PORTSDIR}/graphics/imlib
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" LOCALBASE=${LOCALBASE}
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		Eterm.1
 
@@ -31,9 +30,6 @@
 .if ( defined(KANJI) )
 	${CP} ${FILESDIR}/patch-kanji ${PATCHDIR}
 .endif
-
-post-patch:
-	@find ${WRKSRC} -name '*.orig' | xargs ${RM} -f
 
 post-install:
 	chown root.wheel ${PREFIX}/bin/Eterm
--- /usr/ports.ref/x11/eterm/patches/patch-aa	Fri Feb 26 01:24:11 1999
+++ x11/eterm/patches/patch-aa	Mon May 10 18:36:25 1999
@@ -1,13 +1 @@
---- configure	Wed Jan 13 05:53:30 1999
-+++ configure~	Sun Feb  7 23:17:02 1999
-@@ -1559,8 +1559,8 @@
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig \
-+$libtool_flags --no-verify ${LOCALBASE}/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
  
--- /usr/ports.ref/x11/eterm/pkg/PLIST	Mon Feb 22 14:21:54 1999
+++ x11/eterm/pkg/PLIST	Sat May 22 16:24:03 1999
@@ -1,52 +1,52 @@
-bin/Eterm
 bin/Esetroot
-lib/libmej.so.8
-lib/libmej.so
-lib/libmej.la
-lib/libmej.a
-lib/libEterm.so.8
-lib/libEterm.so
-lib/libEterm.la
+bin/Eterm
 lib/libEterm.a
-share/doc/Eterm/ReleaseNotes
-share/doc/Eterm/Eterm.help
-share/doc/Eterm/Eterm.ref
-share/doc/Eterm/Eterm.tcap
-share/doc/Eterm/Eterm.ti
-share/doc/Eterm/FAQ.html
-share/doc/Eterm/menu_cmd
+lib/libEterm.so
+lib/libEterm.so.8
+lib/libmej.a
+lib/libmej.so
+lib/libmej.so.8
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/Eterm/colortest.sh
 share/Eterm/pix/014.png
 share/Eterm/pix/backwave.jpg
 share/Eterm/pix/button1.jpg
 share/Eterm/pix/button5.jpg
 share/Eterm/pix/circuit.png
-share/Eterm/pix/nebula.jpg
 share/Eterm/pix/fourthday.jpg
 share/Eterm/pix/gaia.jpg
 share/Eterm/pix/galleon.jpg
+share/Eterm/pix/nebula.jpg
 share/Eterm/pix/night_of_the_dragon.jpg
 share/Eterm/pix/pixmaps.list
-share/Eterm/colortest.sh
-share/Eterm/themes/Eterm/MAIN
 share/Eterm/themes/Eterm/Eterm.menu
+share/Eterm/themes/Eterm/MAIN
 share/Eterm/themes/Eterm/pixmaps.list
-share/Eterm/themes/chooser/chooser.menu
 share/Eterm/themes/chooser/MAIN
+share/Eterm/themes/chooser/chooser.menu
 share/Eterm/themes/chooser/pixmaps.list
-share/Eterm/themes/emacs/emacs.menu
 share/Eterm/themes/emacs/MAIN
+share/Eterm/themes/emacs/emacs.menu
 share/Eterm/themes/emacs/pixmaps.list
-share/Eterm/themes/irc/irc.menu
 share/Eterm/themes/irc/MAIN
+share/Eterm/themes/irc/irc.menu
 share/Eterm/themes/irc/pixmaps.list
-share/Eterm/themes/mutt/mutt.menu
 share/Eterm/themes/mutt/MAIN
+share/Eterm/themes/mutt/mutt.menu
 share/Eterm/themes/mutt/pixmaps.list
 share/Eterm/themes/tn3270/MAIN
 share/Eterm/themes/tn3270/pixmaps.list
-share/Eterm/themes/trans/trans.menu
 share/Eterm/themes/trans/MAIN
 share/Eterm/themes/trans/pixmaps.list
+share/Eterm/themes/trans/trans.menu
+share/doc/Eterm/Eterm.help
+share/doc/Eterm/Eterm.ref
+share/doc/Eterm/Eterm.tcap
+share/doc/Eterm/Eterm.ti
+share/doc/Eterm/FAQ.html
+share/doc/Eterm/ReleaseNotes
+share/doc/Eterm/menu_cmd
 @dirrm share/doc/Eterm
 @dirrm share/Eterm/themes/Eterm
 @dirrm share/Eterm/themes/chooser




>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199905222324.BAA48917>