From owner-freebsd-ports Thu Nov 20 13:40:03 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA10285 for ports-outgoing; Thu, 20 Nov 1997 13:40:03 -0800 (PST) (envelope-from owner-freebsd-ports) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA10260; Thu, 20 Nov 1997 13:40:02 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 20 Nov 1997 13:40:02 -0800 (PST) Resent-Message-Id: <199711202140.NAA10260@hub.freebsd.org> Resent-From: gnats (GNATS Management) Resent-To: freebsd-ports Resent-Reply-To: FreeBSD-gnats@FreeBSD.ORG, vanilla@MinJe.com.TW Received: from MinJe.com.TW (qmailr@ns.MinJe.com.TW [210.66.86.1]) by hub.freebsd.org (8.8.7/8.8.7) with SMTP id NAA09650 for ; Thu, 20 Nov 1997 13:32:29 -0800 (PST) (envelope-from vanilla@MinJe.com.TW) Received: (qmail 19961 invoked by uid 900); 20 Nov 1997 20:58:48 -0000 Message-Id: <19971120205848.19960.qmail@MinJe.com.TW> Date: 20 Nov 1997 20:58:48 -0000 From: vanilla@MinJe.com.TW Reply-To: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/5116: Update enlightenment to 0.13 Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >Number: 5116 >Category: ports >Synopsis: Update Enlightenment to 0.13 >Confidential: yes >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 20 13:40:00 PST 1997 >Last-Modified: >Originator: Vanill I. Shu >Organization: Cray running FreeBSD >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: >How-To-Repeat: >Fix: diff -ruN enlightenment.orig/Makefile enlightenment/Makefile --- enlightenment.orig/Makefile Mon Nov 17 12:16:01 1997 +++ enlightenment/Makefile Fri Nov 21 04:42:51 1997 @@ -1,24 +1,31 @@ # New ports collection makefile for: enlightenment -# Version required: 0.12.6 +# Version required: 0.13 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # # $Id: Makefile,v 1.8 1997/11/16 10:02:55 fenner Exp $ # -DISTNAME= enl_DR-0.12.6 -PKGNAME= enlightenment-0.12.6 +DISTNAME= enl_BETA-0.13 +PKGNAME= enlightenment-0.13 CATEGORIES= x11 MASTER_SITES= ftp://cthulhu.mandrake.net/pub/enlightenment/ \ http://www.rasterman.com/ftp/ +EXTRACT_SUFX= .src.tar.gz +DISTFILES= enl_BETA-0.13.src.tar.gz \ + enl-0.13-themes.tar.gz MAINTAINER= vanilla@MinJe.com.TW -LIB_DEPENDS= Im\\.3\\.:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= Im\\.4\\.:${PORTSDIR}/graphics/imlib USE_GMAKE= yes USE_IMAKE= yes NO_INSTALL_MANPAGES= yes -WRKSRC= ${WRKDIR}/enl-0.12.6 +WRKSRC= ${WRKDIR}/enl-0.13 + +post-install: + ${INSTALL_DATA} ${WRKDIR}/enl-0.13-themes/DEFAULT ${X11BASE}/lib/X11/enlightenment/themes + ${INSTALL_DATA} ${WRKDIR}/enl-0.13-themes/DEFAULT_small ${X11BASE}/lib/X11/enlightenment/themes .include diff -ruN enlightenment.orig/files/md5 enlightenment/files/md5 --- enlightenment.orig/files/md5 Tue Nov 18 03:02:39 1997 +++ enlightenment/files/md5 Wed Nov 19 17:01:26 1997 @@ -1 +1,2 @@ -MD5 (enl_DR-0.12.6.tar.gz) = d683ec328d84316fa372deebfb8bc3a8 +MD5 (enl_BETA-0.13.src.tar.gz) = 9675d5ac28cb56a4ab369d180fb8e91a +MD5 (enl-0.13-themes.tar.gz) = b5a96b36e0df0c1273ae4fe27c7696a5 diff -ruN enlightenment.orig/patches/patch-aa enlightenment/patches/patch-aa --- enlightenment.orig/patches/patch-aa Thu Oct 30 16:36:05 1997 +++ enlightenment/patches/patch-aa Fri Nov 21 04:52:17 1997 @@ -1,39 +1,52 @@ ---- Imakefile.orig Wed Oct 29 13:17:45 1997 -+++ Imakefile Thu Oct 30 00:51:22 1997 -@@ -1,6 +1,6 @@ - /* Uncomment this if you want to install under /usr/local - * instead of the places imake picks. */ --#define UseUsrLocal -+/*#define UseUsrLocal */ - /* Uncomment the following line if you have pthreads installed on your - * system (and you would like E to take advantage of this) */ - /* #define USE_PTHREADS */ -@@ -28,11 +28,8 @@ - - #else - /* use default BINDIR, MANDIR */ --ETCDIR=/etc/X11/$(NAME) --THMDIR=/etc/X11/$(NAME)/themes --IMGDIR=/etc/X11/$(NAME)/images/default --BINDIR=/usr/local/bin --MANDIR=/usr/local/man -+ETCDIR=$(ENLROOT) -+THMDIR=$(ENLROOT)/themes - #endif /* UseUsrLocal */ - - CNFDIR=$(ETCDIR) -@@ -81,9 +78,11 @@ - - /* Install any themes */ - THEMESRC = ./themes --THEMES = $(wildcard $(THEMESRC)/*) --THEMEFLAGS = -m 0644 -o root -g root --InstallMultipleFlags($(THEMES),$(THMDIR),$(THEMEFLAGS)) -+THEMES1 = $(THEMESRC)/DEFAULT -+THEMES2 = $(THEMESRC)/DEFAULT_small -+THEMEFLAGS = -m 0644 -o root -g wheel -+InstallMultipleFlags($(THEMES1),$(THMDIR),$(THEMEFLAGS)) -+InstallMultipleFlags($(THEMES2),$(THMDIR),$(THEMEFLAGS)) +--- Enl.tmpl.orig Wed Nov 19 11:08:21 1997 ++++ Enl.tmpl Fri Nov 21 04:43:04 1997 +@@ -5,7 +5,7 @@ + XCOMM ---------------------- + XCOMM Define this to be the location of the root installation directory. - /* This allows `-I.' to work for the imlib header. */ - includes:: +-ENLROOT=/usr/local/enlightenment ++ENLROOT=${X11BASE}/lib/X11/enlightenment + + XCOMM Enlightenment Themes + XCOMM -------------------- +@@ -22,7 +22,7 @@ + XCOMM performance degradation on non-multi-CPU architectures, depending + XCOMM upon how effecient your threads are. + +-#define ThreadedE ThreadedX ++XCOMM #define ThreadedE ThreadedX + + XCOMM C Compiler Options + XCOMM ------------------ +@@ -38,7 +38,7 @@ + + #if HasGcc2 /* GNU C */ + DEFINES = -D_USE_VSNPRINTF +-CDEBUGFLAGS = -Wall -pedantic ++CDEBUGFLAGS = -Wall -pedantic -O2 -m486 + #elif HasSunC /* Sun's DevPro v2.x + */ + DEFINES = -D_USE_VSNPRINTF -D__EXTENSIONS__ -D_POSIX_C_SOURCE + CDEBUGFLAGS = -v -fast -native +--- Imakefile.orig Wed Nov 19 11:08:07 1997 ++++ Imakefile Fri Nov 21 04:43:39 1997 +@@ -34,7 +34,7 @@ + + INCLUDES += -I. -I/usr/local/include + SYS_LIBRARIES += $(XLIB) -lm +-LOCAL_LIBRARIES += -lIm ++LOCAL_LIBRARIES += -lIm -ljpeg -lz -lpng -L/usr/local/lib + + XCOMM Now, based on that, we can decided how fancy we want to be... + +@@ -45,9 +45,9 @@ + #endif + + XCOMM Define _our_ places to install stuff... +-ENLBINDIR=$(ENLROOT)/bin ++ENLBINDIR=${X11BASE}/bin + ENLTHMDIR=$(ENLROOT)/themes +-ENLETCDIR=$(ENLROOT)/etc ++ENLETCDIR=$(ENLROOT) + + XCOMM Once we know these... + DEFINES += -DSYSCONFIG_DIR=\"$(ENLETCDIR)/\" diff -ruN enlightenment.orig/pkg/PLIST enlightenment/pkg/PLIST --- enlightenment.orig/pkg/PLIST Mon Sep 15 12:44:51 1997 +++ enlightenment/pkg/PLIST Wed Nov 19 17:09:01 1997 @@ -1,5 +1,4 @@ bin/enlightenment -lib/X11/enlightenment/README lib/X11/enlightenment/themes/DEFAULT lib/X11/enlightenment/themes/DEFAULT_small @dirrm lib/X11/enlightenment/themes >Audit-Trail: >Unformatted: