FreeBSD Mail Archives

Date:      Mon, 19 Jun 2000 20:11:27 -0700 (PDT)
From:      kbyanc@posi.net
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        nakai@freebsd.org
Subject:   ports/19396: restructure of epplets port
Message-ID:  <200006200330.XAA04426@kronos.networkrichmond.com>

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


>Number:         19396
>Category:       ports
>Synopsis:       restructure of epplets port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 19 20:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Kelly Yancey
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
>Environment:
>Description:

	Currently the x11-wm/epplets port builds both the epplet library
	and a collection of epplets using the library. This was fine with
	it was the only epplet port. However, as more epplet ports are
	created (i.e. PR 19361), the current framework requires users to
	install all the (mostly broken) epplets in the x11/epplets port
	just to get libepplet required to build their desired port.

	This PR addresses the issue by breaking the current x11-wm/epplets
	port into 2 ports: just the library (x11-wm/libepplet) and the
	collection of epplets (x11-wm/epplets) so that future ports can
	depend on libepplet. This PR also includes a patch to the x11/erun
	port included in PR 19361 to make it depend on the new
	x11-wm/libepplet port.

	-Kelly
	 kbyanc@posi.net

>How-To-Repeat:
>Fix:

	First, create this new port: x11-wm/libepplet that just builds the
	epplet toolkit itself (ala libdockapp). Since this new port is
	derived from the existing epplets port that nakai@freebsd.org
	maintains, feel free to change the maintainer if he so desires.

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	x11-wm/libepplet/
#	x11-wm/libepplet/Makefile
#	x11-wm/libepplet/files
#	x11-wm/libepplet/files/md5
#	x11-wm/libepplet/pkg
#	x11-wm/libepplet/pkg/PLIST
#	x11-wm/libepplet/pkg/DESCR
#	x11-wm/libepplet/pkg/COMMENT
#
echo c - x11-wm/libepplet/
mkdir -p x11-wm/libepplet/ > /dev/null 2>&1
echo x - x11-wm/libepplet/Makefile
sed 's/^X//' >x11-wm/libepplet/Makefile << 'END-of-x11-wm/libepplet/Makefile'
X# New ports collection makefile for:	libepplet
X# Date created:        			18 October 1999
X# Whom:					Kelly Yancey <kbyanc@posi.net>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	libepplet
XPORTVERSION= 	0.5
XCATEGORIES=	x11-wm devel
XMASTER_SITES=	ftp://ftp.enlightenment.org/e/epplets/
XDISTNAME=	epplet-base-${PORTVERSION}
X
XMAINTAINER=	kbyanc@posi.net
X
XBUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
X
XWRKSRC=		${WRKDIR}/Epplets-0.5
X
XUSE_X_PREFIX=	yes
XINSTALLS_SHLIB=	yes
XGNU_CONFIGURE=	yes
XCONFIGURE_ARGS=	--enable-fsstd
XCONFIGURE_ENV=	EROOT=${X11BASE}/share/enlightenment \
X		EBIN=${X11BASE}/bin \
X		LIBS="-L${LOCALBASE}/lib -lintl" \
X		X_LIBS="-lxpg4"
X
XMAKE_ENV=	echo -n; cd ${WRKSRC}/api;
X
X.include <bsd.port.mk>
END-of-x11-wm/libepplet/Makefile
echo c - x11-wm/libepplet/files
mkdir -p x11-wm/libepplet/files > /dev/null 2>&1
echo x - x11-wm/libepplet/files/md5
sed 's/^X//' >x11-wm/libepplet/files/md5 << 'END-of-x11-wm/libepplet/files/md5'
XMD5 (epplet-base-0.5.tar.gz) = 6be063dcff76dcdef0f2bfdba4cd111d
END-of-x11-wm/libepplet/files/md5
echo c - x11-wm/libepplet/pkg
mkdir -p x11-wm/libepplet/pkg > /dev/null 2>&1
echo x - x11-wm/libepplet/pkg/PLIST
sed 's/^X//' >x11-wm/libepplet/pkg/PLIST << 'END-of-x11-wm/libepplet/pkg/PLIST'
Xinclude/epplet.h
Xlib/libepplet.a
Xlib/libepplet.la
Xlib/libepplet.so
Xlib/libepplet.so.1
END-of-x11-wm/libepplet/pkg/PLIST
echo x - x11-wm/libepplet/pkg/DESCR
sed 's/^X//' >x11-wm/libepplet/pkg/DESCR << 'END-of-x11-wm/libepplet/pkg/DESCR'
XLibrary for building enlightenment dock applications.
X
X  -Kelly
X   kbyanc@posi.net
END-of-x11-wm/libepplet/pkg/DESCR
echo x - x11-wm/libepplet/pkg/COMMENT
sed 's/^X//' >x11-wm/libepplet/pkg/COMMENT <<
'END-of-x11-wm/libepplet/pkg/COMMENT'
XEnlightenment dock application toolkit
END-of-x11-wm/libepplet/pkg/COMMENT
exit


	Next, apply this patch to the existing epplets port:

diff -ruN x11-wm/epplets.orig/Makefile x11-wm/epplets/Makefile
--- x11-wm/epplets.orig/Makefile	Mon Jun 19 19:14:52 2000
+++ x11-wm/epplets/Makefile	Mon Jun 19 19:16:57 2000
@@ -13,7 +13,8 @@
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop \
+		epplet.1:${PORTSDIR}/x11-wm/libepplet
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 WRKSRC=		${WRKDIR}/Epplets-0.5
diff -ruN x11-wm/epplets.orig/patches/patch-ak x11-wm/epplets/patches/patch-ak
--- x11-wm/epplets.orig/patches/patch-ak	Wed Dec 31 16:00:00 1969
+++ x11-wm/epplets/patches/patch-ak	Mon Jun 19 19:22:49 2000
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Jun 19 19:21:53 2000
++++ Makefile.in	Mon Jun 19 19:22:19 2000
+@@ -100,7 +100,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = api epplets
++SUBDIRS = epplets
+ 
+ EXTRA_DIST = autogen.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -ruN x11-wm/epplets.orig/patches/patch-al x11-wm/epplets/patches/patch-al
--- x11-wm/epplets.orig/patches/patch-al	Wed Dec 31 16:00:00 1969
+++ x11-wm/epplets/patches/patch-al	Mon Jun 19 19:44:25 2000
@@ -0,0 +1,140 @@
+--- epplets/Makefile.in.orig	Tue Jan  4 20:55:53 2000
++++ epplets/Makefile.in	Mon Jun 19 19:44:09 2000
+@@ -106,129 +106,101 @@
+ 
+ ################ Conditional Builds ################
+ E_Mixer_epplet_SOURCES = E-Mixer.c
+-E_Mixer_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Mixer_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-E_Mixer_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS) @SGI_LIBS@
++E_Mixer_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
@SGI_LIBS@
+ 
+ Emix_epplet_SOURCES = Emix.c
+-Emix_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_PlayCD_epplet_SOURCES = E-PlayCD.c
+-E_PlayCD_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_PlayCD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-E_PlayCD_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS) -lcdaudio
++E_PlayCD_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS)
$(X_LIBS) -lcdaudio
+ 
+ EppletTest_epplet_SOURCES = TestEpplet.c
+-EppletTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
+-EppletConfigTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ ####################################################
+ 
+ E_Exec_epplet_SOURCES = E-Exec.c
+-E_Exec_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_SD_epplet_SOURCES = E-SD.c E-SD.h esdcloak.c utils.c utils.h esdcloak.h
+-E_SD_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
+ 
+ E_Load_epplet_SOURCES = E-Load.c
+-E_Load_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-E_Load_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
++E_Load_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
$(GTLIBS)
+ 
+ E_Clock_epplet_SOURCES = E-Clock.c
+-E_Clock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Clock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_MoonClock_epplet_SOURCES = E-MoonClock.c CalcEphem.c CalcEphem.h Moon.c
+-E_MoonClock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_MoonClock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Time_epplet_SOURCES = E-Time.c
+-E_Time_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Time_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Magic_epplet_SOURCES = E-Magic.c
+-E_Magic_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Magic_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Areas_epplet_SOURCES = E-Areas.c
+-E_Areas_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Net_epplet_SOURCES = E-Net.c net.c net.h
+-E_Net_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Net_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_NetFlame_epplet_SOURCES = E-NetFlame.c net.c net.h
+-E_NetFlame_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
+-E_Cpu_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-E_Cpu_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
++E_Cpu_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
$(GTLIBS)
+ 
+ E_Power_epplet_SOURCES = E-Power.c
+-E_Power_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Power_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Biff_epplet_SOURCES = E-Biff.c mbox.c
+-E_Biff_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_MemWatch_epplet_SOURCES = E-MemWatch.c
+-E_MemWatch_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-E_MemWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
++E_MemWatch_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS)
$(X_LIBS) $(GTLIBS)
+ 
+ E_Disk_epplet_SOURCES = E-Disk.c
+-E_Disk_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Sys_epplet_SOURCES = E-Sys.c
+-E_Sys_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-E_Sys_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
++E_Sys_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
$(GTLIBS)
+ 
+ E_Slides_epplet_SOURCES = E-Slides.c
+-E_Slides_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Slides_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_Xss_epplet_SOURCES = E-Xss.c
+-E_Xss_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_ScreenShoot_epplet_SOURCES =  E-ScreenShoot.c E-ScreenShoot.h cloak.c
utils.c utils.h cloak.h
+ 
+-E_ScreenShoot_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_NetGraph_epplet_SOURCES = E-NetGraph.c net.c net.h
+-E_NetGraph_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_ScreenSave_epplet_SOURCES =  E-ScreenSave.c E-ScreenSave.h cloak.c utils.c
utils.h cloak.h
+ 
+-E_ScreenSave_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
+-E_UrlWatch_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
+-E_UrlWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS)
++E_UrlWatch_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS)
$(X_LIBS)
+ 
+ E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
+-E_Mountbox_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
+ E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+ 
+ INCLUDES = -I. -I$(top_builddir)/api -I$(top_srcdir)/api -I$(top_srcdir) -I..
-I$(includedir) -I$(prefix)/include -I/usr/local/include $(X_CFLAGS)
@SGI_DEFINES@
+-LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib
-L/usr/local/lib $(LIBS) $(X_LIBS)
++LDADD = -lepplet -L$(libdir) -L$(prefix)/lib -L/usr/local/lib $(LIBS)
$(X_LIBS)
+ 
+ # You can use the following command to generate this line:
+ # ABOUT_DOCS = `(cd epplets && ls -1d *.ABOUT/* 2>/dev/null | grep -v CVS)`
diff -ruN x11-wm/epplets.orig/pkg/COMMENT x11-wm/epplets/pkg/COMMENT
--- x11-wm/epplets.orig/pkg/COMMENT	Mon Jun 19 19:14:52 2000
+++ x11-wm/epplets/pkg/COMMENT	Mon Jun 19 19:17:57 2000
@@ -1 +1 @@
-Enlightenment dock application toolkit
+A collection of Enlightenment dock applications
diff -ruN x11-wm/epplets.orig/pkg/DESCR x11-wm/epplets/pkg/DESCR
--- x11-wm/epplets.orig/pkg/DESCR	Mon Jun 19 19:14:52 2000
+++ x11-wm/epplets/pkg/DESCR	Mon Jun 19 19:18:41 2000
@@ -1,4 +1,5 @@
-enlightenment dock application toolkit
+A collection of dock applications for use with
+the Enlightenment window manager.
 
 Only mail and clocks epplets work currently.
 Please send patches to MAINAINER if you can
diff -ruN x11-wm/epplets.orig/pkg/PLIST x11-wm/epplets/pkg/PLIST
--- x11-wm/epplets.orig/pkg/PLIST	Mon Jun 19 19:14:52 2000
+++ x11-wm/epplets/pkg/PLIST	Mon Jun 19 19:17:28 2000
@@ -23,11 +23,6 @@
 bin/E-UrlWatch.epplet
 bin/E-Xss.epplet
 bin/Emix.epplet
-include/epplet.h
-lib/libepplet.a
-lib/libepplet.la
-lib/libepplet.so
-lib/libepplet.so.1
 share/enlightenment/epplet_data/E-Biff/7of9.png
 share/enlightenment/epplet_data/E-Biff/newmail.png
 share/enlightenment/epplet_data/E-Biff/nomail.png


	Finally, apply this patch to the as-yet-uncommitted x11/erun port
	(PR #19361)

diff -ruN x11/erun.orig/Makefile x11/erun/Makefile
--- x11/erun.orig/Makefile	Mon Jun 19 19:56:03 2000
+++ x11/erun/Makefile	Mon Jun 19 19:56:32 2000
@@ -12,7 +12,7 @@
 
 MAINTAINER=	kbyanc@posi.net
 
-LIB_DEPENDS=    epplet.1:${PORTSDIR}/x11-wm/epplets
+LIB_DEPENDS=    epplet.1:${PORTSDIR}/x11-wm/libepplet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 

>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?200006200330.XAA04426>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation