Convert to libtool. Shared theme modules are named foo.theme.so by

default, but foo.theme is tried afterwards as fallback. Bump revision.
Discussed with jlam@

9 files changed, 311 insertions, 29 deletions

diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile
index 9527dc7cef0..03d663fd21c 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/18 14:07:54 joerg Exp $
 #
 
 DISTNAME=	efltk-2.0.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ede/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,12 +16,14 @@ GNU_CONFIGURE=		yes
 USE_LANGUAGES+=		c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
+USE_LIBTOOL=		yes
 BUILD_USES_MSGFMT=	yes
 
 CONFIGURE_ARGS+=	--enable-iconv
 CONFIGURE_ARGS+=	--enable-xft
 CONFIGURE_ARGS+=	--enable-plugins
 CONFIGURE_ARGS+=	--disable-unixODBC
+CONFIGURE_ARGS+=	--disable-shared
 
 .include "options.mk"
 
diff --git a/x11/efltk/PLIST b/x11/efltk/PLIST
index 4dcc3e8756e..298125f2955 100644
--- a/x11/efltk/PLIST
+++ b/x11/efltk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/09/02 14:41:37 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/18 14:07:54 joerg Exp $
 bin/efltk-config
 include/efltk/Enumerations.h
 include/efltk/Fl.h
@@ -204,21 +204,15 @@ include/efltk/xml/Fl_XmlNode.h
 include/efltk/xml/Fl_XmlNode_List.h
 include/efltk/xml/Fl_XmlParser.h
 include/efltk/xml/Fl_XmlTokenizer.h
-lib/fltk/eblue.theme
-lib/fltk/essai.theme
-lib/fltk/motif.theme
-lib/libefltk.so
-lib/libefltk.so.2.0
-${OPENGL}lib/libefltk_gl.so
-${OPENGL}lib/libefltk_gl.so.2.0
-lib/libefltk_images.so
-lib/libefltk_images.so.2.0
-${MYSQL}lib/libefltk_mysql.so
-${MYSQL}lib/libefltk_mysql.so.2.0
-lib/libefltk_net.so
-lib/libefltk_net.so.2.0
-lib/libefltk_xml.so
-lib/libefltk_xml.so.2.0
+lib/fltk/eblue.theme.la
+lib/fltk/essai.theme.la
+lib/fltk/motif.theme.la
+lib/libefltk.la
+${OPENGL}lib/libefltk_gl.la
+lib/libefltk_images.la
+${MYSQL}lib/libefltk_mysql.la
+lib/libefltk_net.la
+lib/libefltk_xml.la
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/efltk.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/efltk.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/efltk.mo
diff --git a/x11/efltk/distinfo b/x11/efltk/distinfo
index afd2959ffc7..387a6e3a85a 100644
--- a/x11/efltk/distinfo
+++ b/x11/efltk/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.2 2005/09/18 21:18:53 minskim Exp $
+$NetBSD: distinfo,v 1.3 2006/02/18 14:07:54 joerg Exp $
 
 SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
 RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
 Size (efltk-2.0.5.tar.bz2) = 1241294 bytes
 SHA1 (patch-aa) = d87f595661c465fc315b643241b22ef65926906e
 SHA1 (patch-ab) = 27a6870c068c8ea44089955a7d3c0492191f23ba
-SHA1 (patch-ac) = c87e78e57eab8ffb056e3a9ac2fddc0ee19abcfd
+SHA1 (patch-ac) = cf4474ff83f9630f6b310bc3df0fc16adaff7138
+SHA1 (patch-ad) = 41911884bc0eaa6a4de869b90d62c9ee27d1908b
+SHA1 (patch-ae) = db02f224887f6d0e55334310ad0a3f09da6499b8
+SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd
+SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a
diff --git a/x11/efltk/options.mk b/x11/efltk/options.mk
index 805f8236e54..1e49702af10 100644
--- a/x11/efltk/options.mk
+++ b/x11/efltk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/09/02 14:41:37 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2006/02/18 14:07:54 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.efltk
 PKG_SUPPORTED_OPTIONS=	opengl mysql
@@ -8,10 +8,12 @@ PKG_SUPPORTED_OPTIONS=	opengl mysql
 .if !empty(PKG_OPTIONS:Mopengl)
 PLIST_SUBST+=		OPENGL=
 CONFIGURE_ARGS+=	--enable-opengl
+MAKE_ENV+=		HAVE_OPENGL=yes
 .  include "../../graphics/MesaLib/buildlink3.mk"
 .else
 PLIST_SUBST+=		OPENGL="@comment "
 CONFIGURE_ARGS+=	--disable-opengl
+MAKE_ENV+=		HAVE_OPENGL=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
diff --git a/x11/efltk/patches/patch-ac b/x11/efltk/patches/patch-ac
index 46eb84c2d28..32889e6101c 100644
--- a/x11/efltk/patches/patch-ac
+++ b/x11/efltk/patches/patch-ac
@@ -1,13 +1,69 @@
-$NetBSD: patch-ac,v 1.1 2005/09/18 21:18:53 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2006/02/18 14:07:54 joerg Exp $
 
---- src/Makefile.orig	2005-02-03 07:11:44.000000000 -0800
+--- src/Makefile.orig	2005-02-03 15:11:44.000000000 +0000
 +++ src/Makefile
-@@ -89,7 +89,7 @@ $(LIBRARY).a:
+@@ -42,7 +42,10 @@ OUT_MAGIC := $(shell mkdir $(EFLTK_TOPDI
+ ################################################################
+ 
+ FLDIRS = core widgets db 
+-DIRS = xml images opengl net
++DIRS = xml images net
++ifeq ($(HAVE_OPENGL),yes)
++DIRS+= opengl
++endif
+ 
+ LIBNAME = libefltk
+ DSOLIBNAME = $(LIBNAME)
+@@ -52,6 +55,18 @@ DSONAME = $(LIBNAME)$(DSOEXT)
+ 
+ all: $(BUILDTARGETS)
+ 
++libtool:
++	@rm -f $(LIBRARY).la
++	@for dir in $(FLDIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) libtool) || exit;\
++	done	
++	$(MAKE) $(LIBRARY).la
++	@for dir in $(DIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) libtool) || exit;\
++	done	
++
+ static:
+ 	@rm -f $(LIBRARY)$(LIBEXT)
+ 	@for dir in $(FLDIRS); do\
+@@ -80,12 +95,17 @@ programs:
+ 
+ STATIC_OBJECTS = core/*.static.o widgets/*.static.o db/*.static.o
+ SHARED_OBJECTS = core/*.shared.o widgets/*.shared.o db/*.shared.o
++LIBTOOL_OBJECTS = core/*.lo widgets/*.lo db/*.lo
+ 
+ $(LIBRARY).a:
+ 	@echo $(LIBCOMMAND) $@ ...
+ 	@$(LIBCOMMAND) $@ $(STATIC_OBJECTS)
+ 	@$(RANLIB) $@
+ 
++${LIBRARY}.la:
++	${LIBTOOL} --mode=link ${CXX} -o $@ ${CXXFLAGS} ${LDFLAGS} \
++	    -rpath ${libdir} -version-info 2:0 ${LIBTOOL_OBJECTS} ${DSOLIBS}
++
  $(DSO).so.$(FL_API_VERSION) $(DSO).sl.2:
  	@rm -f $@
  	@echo $(DSOCOMMAND) $(DSONAME) ...
--	@$(DSOCOMMAND) $(DSONAME) $(SHARED_OBJECTS) $(DSOLIBS)
-+	@$(DSOCOMMAND) $(DSONAME) $(SHARED_OBJECTS) $(DSOLIBS) $(THREADSLIBS) $(COMPILER_RPATH_FLAG)$(PTHREADBASE)/lib
- ifneq ($(STRIP), ) 
- 	@$(STRIP) $(DSONAME)
- endif
+@@ -130,6 +150,15 @@ install_static: static
+         	(cd $$dir;$(MAKE) $(MFLAGS) install_static) || exit;\
+ 	done
+ 
++install_libtool: libtool
++	@echo "Installing libraries..."
++	${BSD_INSTALL_DATA_DIR} $(libdir)
++	${LIBTOOL} --mode=install  ${BSD_INSTALL_LIB} ${LIBRARY}.la ${libdir}
++	@for dir in $(DIRS) $(FLDIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) install_libtool) || exit;\
++	done
++
+ install_shared: shared
+ 	@echo "Installing shared libraries..."
+ 	@rm -f $(libdir)/$(DLLIMPORTNAME)
diff --git a/x11/efltk/patches/patch-ad b/x11/efltk/patches/patch-ad
new file mode 100644
index 00000000000..9f595bf757d
--- /dev/null
+++ b/x11/efltk/patches/patch-ad
@@ -0,0 +1,104 @@
+$NetBSD: patch-ad,v 1.1 2006/02/18 14:07:54 joerg Exp $
+
+--- src/makeinclude_tmpl.orig	2006-02-01 17:48:42.000000000 +0000
++++ src/makeinclude_tmpl
+@@ -50,6 +50,14 @@ LIBRARY = $(EFLTK_TOPDIR)/lib/$(LIBNAME)
+ DSO = $(EFLTK_TOPDIR)/lib/$(LIBNAME)
+ DSONAME = $(LIBNAME)$(DSOEXT)
+ 
++libtool: ${LIBRARY}.la
++ifneq ($(DIRS), )
++	@for dir in $(DIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) libtool) || exit;\
++	done
++endif
++
+ static: $(LIBRARY)$(LIBEXT)
+ ifneq ($(DIRS), )
+ 	@for dir in $(DIRS); do\
+@@ -72,6 +80,10 @@ $(LIBRARY).a: $(STATIC_OBJECTS)
+ 	@$(LIBCOMMAND) $@ $(STATIC_OBJECTS)
+ 	@$(RANLIB) $@
+ 
++$(LIBRARY).la: $(OBJECTS:.o=.lo)
++	${LIBTOOL} --mode=link ${CXX} -o $@ ${CXXFLAGS} ${LDFLAGS} \
++	    -rpath ${libdir} -version-info 2:0 ${OBJECTS:.o=.lo} ${DSOLIBS}
++
+ $(DSO).so.$(FL_API_VERSION) $(DSO).sl.$(FL_API_VERSION): $(SHARED_OBJECTS)
+ 	@rm -f $@
+ 	@echo $(DSOCOMMAND) $(DSONAME) ...
+@@ -112,6 +124,16 @@ ifneq ($(DIRS), )
+ 	done
+ endif
+ 
++install_libtool: libtool
++	${BSD_INSTALL_DATA_DIR} ${libdir}
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIBRARY}.la ${libdir}
++ifneq ($(DIRS), )
++	@for dir in $(DIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) install_libtool) || exit;\
++	done
++endif
++
+ install_shared: shared
+ 	@echo "Installing shared libraries..."
+ 	@mkdir -p $(libdir)
+@@ -140,6 +162,14 @@ ifneq ($(DIRS), )
+ 	done
+ endif
+ 
++libtool: ${OBJECTS:.o=.lo}
++ifneq ($(DIRS), )
++	@for dir in $(DIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) libtool) || exit;\
++	done
++endif
++
+ shared: $(SHARED_OBJECTS)
+ ifneq ($(DIRS), )
+ 	@for dir in $(DIRS); do\
+@@ -156,6 +186,14 @@ ifneq ($(DIRS), )
+ 	done
+ endif
+ 
++install_libtool: libtool
++ifneq ($(DIRS), )
++	@for dir in $(DIRS); do\
++        	if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\
++        	(cd $$dir;$(MAKE) $(MFLAGS) install_libtool) || exit;\
++	done
++endif
++
+ install_shared: shared
+ ifneq ($(DIRS), )
+ 	@for dir in $(DIRS); do\
+@@ -204,12 +242,7 @@ install_programs: $(PROGRAM)
+ ifneq ($(PROGRAM), )
+ 	@echo Installing $(PROGRAM)..
+ 	@mkdir -p $(bindir)
+-	@if [ ! "$(OSTYPE)" = "cygwin32" ]; then \
+-		cp $(EFLTK_BINDIR)/$(PROGRAM) $(bindir)/; \
+-		chmod 755 $(bindir)/$(PROGRAM); \
+-	else \
+-		cp $(EFLTK_BINDIR)/$(PROGRAM).exe $(bindir)/; \
+-	fi
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ${EFLTK_BINDIR}/${PROGRAM} ${bindir}
+ endif
+ ifneq ($(DIRS), )
+ 	@for dir in $(DIRS); do\
+@@ -222,11 +255,7 @@ ifneq ($(PROGRAM), )
+ 
+ $(PROGRAM): $(OBJECTS)
+ 	@echo Linking $(PROGRAM)...
+-	$(CXX) -o $(EFLTK_BINDIR)/$(PROGRAM) $(OBJECTS) $(PROGRAM_LIBS) $(LDLIBS)
+-ifneq ($(STRIP), ) 
+-	@$(STRIP) $(EFLTK_BINDIR)/$(PROGRAM)$(EXEEXT)
+-endif
+-
++	${LIBTOOL} $(CXX) -o $(EFLTK_BINDIR)/$(PROGRAM) $(OBJECTS) $(PROGRAM_LIBS) $(LDLIBS)
+ endif
+ 
+ uninstall: 
diff --git a/x11/efltk/patches/patch-ae b/x11/efltk/patches/patch-ae
new file mode 100644
index 00000000000..1ae860529c4
--- /dev/null
+++ b/x11/efltk/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.1 2006/02/18 14:07:54 joerg Exp $
+
+--- makeinclude.in.orig	2006-02-01 18:02:22.000000000 +0000
++++ makeinclude.in
+@@ -104,8 +104,8 @@ ODBCLIBS	=$(FLODBCLIB) $(UNIXODBCLIB)
+ MYSQLLIBS_	=$(FLMYSQLLIB) $(MYSQLLIBS)
+ 
+ EXEEXT		=@EXEEXT@
+-BUILDTARGETS	=@BUILDTARGETS@
+-INSTALLTARGETS	=@INSTALLTARGETS@
++BUILDTARGETS	=libtool programs
++INSTALLTARGETS	=install_libtool install_programs
+ 
+ # Build commands and filename extensions...
+ .SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
+@@ -131,6 +131,14 @@ INSTALLTARGETS	=@INSTALLTARGETS@
+ 	@echo Compiling $<...
+ 	@$(CC) $(CFLAGS) -c $< -o $@
+ 
++%.lo : %.cpp
++	@echo Compiling $<...
++	@${LIBTOOL} --mode=compile $(CXX) $(CXXFLAGS) -DFL_SHARED -c $< -o $@
++
++%.lo : %.c
++	@echo Compiling $<...
++	@${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DFL_SHARED -c $< -o $@
++
+ %.shared.o : %.cpp
+ 	@echo Compiling $<...
+ 	@$(CXX) $(DSOCFLAGS) $(CXXFLAGS) -c $< -o $@
diff --git a/x11/efltk/patches/patch-af b/x11/efltk/patches/patch-af
new file mode 100644
index 00000000000..6cca92cb585
--- /dev/null
+++ b/x11/efltk/patches/patch-af
@@ -0,0 +1,50 @@
+$NetBSD: patch-af,v 1.1 2006/02/18 14:07:54 joerg Exp $
+
+--- themes/Makefile.orig	2006-02-01 18:40:28.000000000 +0000
++++ themes/Makefile
+@@ -44,6 +44,8 @@ static: $(LIBRARY)$(LIBEXT)
+ 
+ shared: $(THEMES)
+ 
++libtool: ${THEMES:.theme=.theme.la}
++
+ programs:
+ 
+ $(LIBRARY).a: $(OBJECTS)
+@@ -55,14 +57,23 @@ ESSAI_OBJ = essai.shared.o
+ essai.theme : $(ESSAI_OBJ)
+ 	$(THEMECOMMAND) $@ $(ESSAI_OBJ) $(DSOLIBS)
+ 
++essai.theme.la : $(ESSAI_OBJ:.shared.o=.lo)
++	${LIBTOOL} --mode=link ${CXX} -o $@ -module -rpath ${libdir}/fltk $(ESSAI_OBJ:.shared.o=.lo) $(DSOLIBS)
++
+ EBLUE_OBJ = eblue.shared.o
+ eblue.theme : $(EBLUE_OBJ)
+ 	$(THEMECOMMAND) $@ $(EBLUE_OBJ) $(DSOLIBS)
+ 
++eblue.theme.la : $(EBLUE_OBJ:.shared.o=.lo)
++	${LIBTOOL} --mode=link ${CXX} -o $@ -module -rpath ${libdir}/fltk $(EBLUE_OBJ:.shared.o=.lo) $(DSOLIBS)
++
+ MOTIF_OBJ = motif.shared.o
+ motif.theme : $(MOTIF_OBJ)
+ 	$(THEMECOMMAND) $@ $(MOTIF_OBJ) $(DSOLIBS)
+ 
++motif.theme.la : $(MOTIF_OBJ:.shared.o=.lo)
++	${LIBTOOL} --mode=link ${CXX} -o $@ -module -rpath ${libdir}/fltk $(MOTIF_OBJ:.shared.o=.lo) $(DSOLIBS)
++
+ clean :
+ 	-@ rm -f *.o $(LIBRARY)$(LIBEXT) $(THEMES) core *~ makedepend
+ 	@touch makedepend
+@@ -77,6 +88,12 @@ install_shared:
+ 	@-mkdir -p $(libdir)/fltk
+ 	@cp -f $(THEMES) $(libdir)/fltk
+ 
++install_libtool:
++	${BSD_INSTALL_DATA_DIR} ${libdir}/fltk
++	for f in ${THEMES:.theme=.theme.la}; do \
++		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$f ${libdir}/fltk; \
++	done
++
+ uninstall:
+ 	@rm -R -f $(libdir)/fltk
+ 
diff --git a/x11/efltk/patches/patch-ag b/x11/efltk/patches/patch-ag
new file mode 100644
index 00000000000..07fecaecade
--- /dev/null
+++ b/x11/efltk/patches/patch-ag
@@ -0,0 +1,40 @@
+$NetBSD: patch-ag,v 1.1 2006/02/18 14:07:54 joerg Exp $
+
+--- src/core/Fl_Style.cpp.orig	2003-02-02 10:50:33.000000000 +0000
++++ src/core/Fl_Style.cpp
+@@ -284,21 +284,34 @@ Fl_Theme Fl_Style::load_theme(const char
+ 
+ Fl_Theme Fl_Style::load_theme(const char* name)
+ {
++    static const char so_suffix[] = ".so";
++    const char *suffix = so_suffix;
++
+     // no name leaves the built-in default:
+     if (!name || !*name) return fltk_theme;
+ 
++retry:
+     // add ".theme" if it is not there:
+     char name_buf[FL_PATH_MAX];
+     int n = strlen(name);
+     if (n < 6 || strcasecmp(name+n-6, ".theme"))
+     {
+-        snprintf(name_buf, FL_PATH_MAX, "%s.theme", name);
++        snprintf(name_buf, FL_PATH_MAX, "%s.theme%s", name, suffix);
++        name = name_buf;
++    } else {
++	snprintf(name_buf, FL_PATH_MAX, "%s%s", name, suffix);
+         name = name_buf;
+     }
+ 
++    
++
+     // search for the file:
+     const char *path = fl_find_config_file(name);
+     if (!path) {
++        if (suffix == so_suffix) {
++	  suffix = "";
++	  goto retry;
++	}
+         // If they said "default" it is ok if the plugin is not found:
+         if (!strncmp(name, "default.", 8)) return fltk_theme;
+         return 0;