diff options
| author | Pete Fritchman <petef@FreeBSD.org> | 2002-08-26 00:38:09 +0000 |
|---|---|---|
| committer | Pete Fritchman <petef@FreeBSD.org> | 2002-08-26 00:38:09 +0000 |
| commit | e47c11addd1da9bba40d4719404de1a8d69463d2 (patch) | |
| tree | 0c1b5d7a6d6aa410e02b8bf78c124295eede529b /x11-wm | |
| parent | Turn Miguel Mendez' ports over to Adam Weinberger. (diff) | |
Don't install our own copy of asclock, depend on the one from the
x11-clocks/asclock port.
PR: 39441
Notes
Notes:
svn path=/head/; revision=65005
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/afterstep-i18n/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/afterstep-i18n/files/patch-ae | 14 | ||||
| -rw-r--r-- | x11-wm/afterstep-i18n/pkg-plist | 1 | ||||
| -rw-r--r-- | x11-wm/afterstep/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/afterstep/files/patch-ac | 16 | ||||
| -rw-r--r-- | x11-wm/afterstep/pkg-plist | 1 |
6 files changed, 29 insertions, 12 deletions
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile index 3ad3bc249542..ed5c20b16672 100644 --- a/x11-wm/afterstep-i18n/Makefile +++ b/x11-wm/afterstep-i18n/Makefile @@ -27,14 +27,15 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org +RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock + DIST_SUBDIR= afterstep USE_X_PREFIX= yes USE_XPM= yes USE_IMAKE= yes INSTALL_TARGET= install install.man MANCOMPRESSED= yes -MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 \ - Pager.1 Wharf.1 +MAN1= afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 AFTERSTEPDIR= ${PREFIX}/lib/X11/afterstep ICONDIR= ${PREFIX}/include/X11/pixmaps diff --git a/x11-wm/afterstep-i18n/files/patch-ae b/x11-wm/afterstep-i18n/files/patch-ae index 171242761a1b..b5597be33a39 100644 --- a/x11-wm/afterstep-i18n/files/patch-ae +++ b/x11-wm/afterstep-i18n/files/patch-ae @@ -1,6 +1,14 @@ ---- Imakefile.orig Sun Mar 9 23:03:27 1997 -+++ Imakefile Tue Sep 19 14:05:36 2000 -@@ -28,4 +28,4 @@ +--- Imakefile.orig Sun Mar 9 07:03:27 1997 ++++ Imakefile Sun Aug 25 18:27:44 2002 +@@ -18,7 +18,6 @@ + modules/Wharf \ + modules/Banner \ + modules/Pager \ +- modules/asclock \ + modules/Animate + + SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS) +@@ -28,4 +27,4 @@ MakeSubdirs($(SUBDIRS)) /* Doesn't work for me! */ diff --git a/x11-wm/afterstep-i18n/pkg-plist b/x11-wm/afterstep-i18n/pkg-plist index a1d50d99fee7..adba01ff20b3 100644 --- a/x11-wm/afterstep-i18n/pkg-plist +++ b/x11-wm/afterstep-i18n/pkg-plist @@ -1,5 +1,4 @@ bin/afterstep -bin/asclock lib/X11/afterstep/Animate lib/X11/afterstep/Audio lib/X11/afterstep/Auto diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index 603e36469828..386bf28bb7e1 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -16,13 +16,15 @@ DISTNAME= AfterStep-${PORTVERSION} MAINTAINER= ports@FreeBSD.org +RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock + NO_LATEST_LINK= yes USE_X_PREFIX= yes USE_XPM= yes USE_IMAKE= yes INSTALL_TARGET= install install.man MANCOMPRESSED= yes -MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 +MAN1= afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 SRCDIRS= afterstep \ modules/Animate modules/Audio modules/Auto \ diff --git a/x11-wm/afterstep/files/patch-ac b/x11-wm/afterstep/files/patch-ac index 08d1edddde2e..b5597be33a39 100644 --- a/x11-wm/afterstep/files/patch-ac +++ b/x11-wm/afterstep/files/patch-ac @@ -1,8 +1,16 @@ ---- Imakefile.orig Sun Mar 9 23:03:27 1997 -+++ Imakefile Tue Sep 19 14:05:36 2000 -@@ -28,4 +28,4 @@ +--- Imakefile.orig Sun Mar 9 07:03:27 1997 ++++ Imakefile Sun Aug 25 18:27:44 2002 +@@ -18,7 +18,6 @@ + modules/Wharf \ + modules/Banner \ + modules/Pager \ +- modules/asclock \ + modules/Animate + + SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS) +@@ -28,4 +27,4 @@ MakeSubdirs($(SUBDIRS)) - + /* Doesn't work for me! */ -/* #DependSubdirs($(SUBDIRS))*/ +#DependSubdirs($(SUBDIRS)) diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist index 3f33cc09ebde..8f0f3110b05a 100644 --- a/x11-wm/afterstep/pkg-plist +++ b/x11-wm/afterstep/pkg-plist @@ -1,5 +1,4 @@ bin/afterstep -bin/asclock include/X11/pixmaps/3dpaint.xpm include/X11/pixmaps/AFstep.xpm include/X11/pixmaps/AfterStep.xpm |