diff options
author | jlam <jlam@pkgsrc.org> | 2000-10-29 23:45:35 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2000-10-29 23:45:35 +0000 |
commit | 706b30917c167184cda9eece43aaba029e375038 (patch) | |
tree | 58e4e241824d9b4f17cd6440eddcc71cc063de81 /x11 | |
parent | a3a6ac7eb54aadcf5e4b4f4af86a7c4b8390eb87 (diff) | |
download | pkgsrc-706b30917c167184cda9eece43aaba029e375038.tar.gz |
Move client.la and related files to a separate sawfish-replibs package.
This fixes the problem reported in PR#11327 where the client libs install
under ${LOCALBASE} while the rest of sawfish install under ${X11PREFIX}.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/sawfish/Makefile | 24 | ||||
-rw-r--r-- | x11/sawfish/Makefile.common | 29 | ||||
-rw-r--r-- | x11/sawfish/files/patch-sum | 4 | ||||
-rw-r--r-- | x11/sawfish/patches/patch-ab | 46 | ||||
-rw-r--r-- | x11/sawfish/patches/patch-ac | 12 | ||||
-rw-r--r-- | x11/sawfish/pkg/PLIST | 12 |
6 files changed, 101 insertions, 26 deletions
diff --git a/x11/sawfish/Makefile b/x11/sawfish/Makefile index c8798aa5d5e..50b99b18638 100644 --- a/x11/sawfish/Makefile +++ b/x11/sawfish/Makefile @@ -1,28 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2000/10/27 08:07:46 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2000/10/29 23:45:35 jlam Exp $ # -DISTNAME= sawfish-${SF_VERS} -SF_VERS= 0.32 -CATEGORIES= x11 gnome -MASTER_SITES= ftp://mirror.capital-internet.net/pub/sawmill/sawfish/ \ - ftp://eprom.dhs.org/pub/mirrors/sawmill/ \ - http://ftp.fi.muni.cz/pub/linux/sawmill/ \ - ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/ \ - ftp://ftp.du.se/pub/mirrors/sawfish/ \ - ftp://sawmill.sourceforge.net/pub/sawmill/ +PKGNAME= sawfish-${SF_VERS} -MAINTAINER= danw@netbsd.org -HOMEPAGE= http://sawmill.sourceforge.net/ - -DEPENDS+= librep>=0.13:../../lang/librep -DEPENDS+= rep-gtk>=0.14:../../x11/rep-gtk -DEPENDS+= imlib>=1.8.2:../../graphics/imlib -DEPENDS+= control-center-*:../../x11/controlcenter +DEPENDS+= sawfish-replibs-${SF_VERS}:../../x11/sawfish-replibs USE_X11BASE= # defined -USE_GMAKE= # defined -GNU_CONFIGURE= # defined CONFIGURE_ENV+= LOCALEBASE=${LOCALEBASE} MAKE_ENV+= LOCALEBASE=${LOCALEBASE} @@ -47,4 +31,4 @@ post-install: ${MKDIR} ${PREFIX}/share/sawfish/sounds ${TOUCH} ${PREFIX}/share/sawfish/sounds/.directory -.include "../../mk/bsd.pkg.mk" +.include "../../x11/sawfish/Makefile.common" diff --git a/x11/sawfish/Makefile.common b/x11/sawfish/Makefile.common new file mode 100644 index 00000000000..51d3cf4cd7f --- /dev/null +++ b/x11/sawfish/Makefile.common @@ -0,0 +1,29 @@ +# $NetBSD: Makefile.common,v 1.1 2000/10/29 23:45:35 jlam Exp $ + +DISTNAME= sawfish-${SF_VERS} +SF_VERS= 0.32 +CATEGORIES= x11 gnome +MASTER_SITES= ftp://mirror.capital-internet.net/pub/sawmill/sawfish/ \ + ftp://eprom.dhs.org/pub/mirrors/sawmill/ \ + http://ftp.fi.muni.cz/pub/linux/sawmill/ \ + ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/ \ + ftp://ftp.du.se/pub/mirrors/sawfish/ \ + ftp://sawmill.sourceforge.net/pub/sawmill/ + +MAINTAINER= jlam@netbsd.org +HOMEPAGE= http://sawmill.sourceforge.net/ + +DEPENDS+= librep>=0.13:../../lang/librep +DEPENDS+= rep-gtk>=0.14:../../x11/rep-gtk +DEPENDS+= imlib>=1.8.2:../../graphics/imlib +DEPENDS+= control-center-*:../../x11/controlcenter + +USE_X11= # defined + +USE_GMAKE= # defined +GNU_CONFIGURE= # defined + +FILESDIR= ${.CURDIR}/../../x11/sawfish/files +PATCHDIR= ${.CURDIR}/../../x11/sawfish/patches + +.include "../../mk/bsd.pkg.mk" diff --git a/x11/sawfish/files/patch-sum b/x11/sawfish/files/patch-sum index f129fb8f6b3..38d02cecab1 100644 --- a/x11/sawfish/files/patch-sum +++ b/x11/sawfish/files/patch-sum @@ -1,3 +1,5 @@ -$NetBSD: patch-sum,v 1.1 2000/10/27 08:07:47 jlam Exp $ +$NetBSD: patch-sum,v 1.2 2000/10/29 23:45:35 jlam Exp $ MD5 (patch-aa) = 6a961b7bcdad7af8da19d5bfbb33a69a +MD5 (patch-ab) = 23b7e8287fa350e6cc919fc382c6b4f3 +MD5 (patch-ac) = 002e91f9fef7c646ff8dd959fb008e7c diff --git a/x11/sawfish/patches/patch-ab b/x11/sawfish/patches/patch-ab new file mode 100644 index 00000000000..ff7e135fa5f --- /dev/null +++ b/x11/sawfish/patches/patch-ab @@ -0,0 +1,46 @@ +$NetBSD: patch-ab,v 1.1 2000/10/29 23:45:35 jlam Exp $ + +--- src/Makefile.in.orig Fri Sep 1 18:45:15 2000 ++++ src/Makefile.in +@@ -19,6 +19,9 @@ + # along with sawmill; see the file COPYING. If not, write to + # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + ++# Don't build client.la by default from this Makefile. client.la is ++# packaged by x11/sawfish-replibs. ++ + include ../Makedefs + + top_builddir=.. +@@ -32,7 +35,7 @@ + OBJS := $(SRCS:.c=.o) + + DL_SRCS := gradient.c flippers.c x.c selection.c play-sample.c +-DL_OBJS := $(DL_SRCS:%.c=%.la) client.la ++DL_OBJS := $(DL_SRCS:%.c=%.la) + DL_DSTS = sawfish/wm/util/gradient.la sawfish/wm/util/flippers.la \ + sawfish/wm/util/x.la sawfish/wm/util/selection.la \ + sawfish/wm/util/play-sample.la +@@ -71,6 +74,8 @@ + $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ + $(notdir $(x)) $(DESTDIR)$(sawfishexecdir)/$(dir $(x));) + $(rep_INSTALL_ALIASES) -c . $(DESTDIR)$(sawfishexecdir) ++ ++install-client-la : client.la + $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) client.la $(DESTDIR)$(repexecdir)/sawfish/ + + uninstall : +@@ -82,10 +87,12 @@ + for dl in $(DL_DSTS); do \ + $(rep_LIBTOOL) rm $(DESTDIR)${sawfishexecdir}/$$dl; \ + done ++ ++uninstall-client-la : + $(rep_DL_UNINSTALL) $(DESTDIR)$(repexecdir)/sawfish/client.la + + installdirs : mkinstalldirs +- $(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \ ++ $(SHELL) $< $(DESTDIR)$(bindir) \ + $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x)) + + .libexec : diff --git a/x11/sawfish/patches/patch-ac b/x11/sawfish/patches/patch-ac new file mode 100644 index 00000000000..e440c919300 --- /dev/null +++ b/x11/sawfish/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2000/10/29 23:45:35 jlam Exp $ + +--- src/fake-libexec.orig Thu Sep 28 08:31:04 2000 ++++ src/fake-libexec +@@ -6,7 +6,6 @@ + libexecdir="./.libexec" + + libs="\ +- sawfish.client\ + sawfish.wm.util.flippers\ + sawfish.wm.util.gradient\ + sawfish.wm.util.play-sample\ diff --git a/x11/sawfish/pkg/PLIST b/x11/sawfish/pkg/PLIST index a9c5c2924d1..5049071a660 100644 --- a/x11/sawfish/pkg/PLIST +++ b/x11/sawfish/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2000/10/27 08:07:48 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2000/10/29 23:45:35 jlam Exp $ bin/sawfish bin/sawfish-capplet bin/sawfish-client @@ -12,12 +12,15 @@ info/sawfish.info-3 info/sawfish.info-4 info/sawfish.info-5 @exec install-info --info-dir=%D/info %D/info/sawfish.info -libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish/client.la -libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish/libclient.a -libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish/libclient.so.0.0 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gtk-style +libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/libgradient.a +libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/libgradient.so.0.0 +libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/libselection.a +libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/libselection.so.0.0 +libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/libx.a +libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/libx.so.0.0 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish-about libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish-menu libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/flippers.la @@ -603,4 +606,3 @@ share/sawfish/themes/.directory @dirrm libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM} @dirrm libexec/sawfish/${SF_VERS} @dirrm libexec/sawfish -@dirrm libexec/rep/${MACHINE_GNU_PLATFORM}/sawfish |