diff options
| author | mezz <mezz@FreeBSD.org> | 2004-08-09 19:09:06 +0000 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2004-08-09 19:09:06 +0000 |
| commit | fd8408de6209810a7b50377e91b55e2a3792f64d (patch) | |
| tree | 18f973b1f994f815a8c7e4e62a026adc5804357e /x11-wm/fluxbox | |
| parent | d7fff9997d1877e86a053a89f20cbd93ec0cfa9e (diff) | |
| download | FreeBSD-ports-fd8408de6209810a7b50377e91b55e2a3792f64d.zip FreeBSD-ports-fd8408de6209810a7b50377e91b55e2a3792f64d.tar.gz | |
Clean up this port:
- Move MAN1 outside the bsd.port.pre.mk.
- Turn the knobs order into ABCs order.
- Few other clean up to make the portlint a bit happy man.
- No function change and now is easier to read.
Diffstat (limited to 'x11-wm/fluxbox')
| -rw-r--r-- | x11-wm/fluxbox/Makefile | 35 | ||||
| -rw-r--r-- | x11-wm/fluxbox/pkg-plist | 14 |
2 files changed, 25 insertions, 24 deletions
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index a404c65..70b0784 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -13,9 +13,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} .if defined(WITH_REMEMBER) -PATCH_SITES= http://www.bugfactory.org/~gav/fluxbox/ +PATCH_SITES= http://www.bugfactory.org/~gav/fluxbox/ +PATCHFILES= remember-0.1.14-7.gz PATCH_DIST_STRIP= -p1 -PATCHFILES= remember-0.1.14-7.gz .endif MAINTAINER= mezz@FreeBSD.org @@ -23,21 +23,24 @@ COMMENT= A small and fast window manager based on BlackBox LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools -.if defined(WITH_REMEMBER) -WANT_AUTOMAKE_VER=14 -.endif +WANT_GNOME= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -WANT_GNOME= yes -.if defined(WITH_REMEMBER) -USE_GMAKE= yes -CONFIGURE_ENV= AUTOMAKE=automake14 -.endif CONFIGURE_ARGS= --disable-newwmspec + +MAN1= fluxbox.1 + .if defined(WITH_KDE) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-kde .endif + +.if defined(WITH_REMEMBER) +USE_GMAKE= yes +WANT_AUTOMAKE_VER= 14 +CONFIGURE_ENV= AUTOMAKE=automake14 +.endif + .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-xinerama .endif @@ -49,13 +52,11 @@ CONFIGURE_ARGS+= --enable-xinerama .endif .if defined(WITH_WINSNAP) -PATCH_SITES+= http://www.raisdorf.net/files/FreeBSD/ +PATCH_SITES+= http://www.raisdorf.net/files/FreeBSD/ +PATCHFILES+= winsnap-0.1.14.patch PATCH_DIST_STRIP= -p1 -PATCHFILES+= winsnap-0.1.14.patch .endif -MAN1= fluxbox.1 - .if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-gnome .endif @@ -64,9 +65,6 @@ pre-everything:: @${ECHO_CMD} "" @${ECHO_CMD} "Definable build options" @${ECHO_CMD} "-----------------------" -.if !defined(WITH_XINERAMA) - @${ECHO_CMD} "WITH_XINERAMA - Enable Xinerama support" -.endif .if !defined(WITH_KDE) @${ECHO_CMD} "WITH_KDE - Enable KDE slit support" .endif @@ -77,6 +75,9 @@ pre-everything:: @${ECHO_CMD} "WITH_WINSNAP - Enable the unofficial window snapping patch" @${ECHO_CMD} " (does not work on -current)" .endif +.if !defined(WITH_XINERAMA) + @${ECHO_CMD} "WITH_XINERAMA - Enable Xinerama support" +.endif @${ECHO_CMD} "" post-install: diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist index 9db0795..d8b7af8 100644 --- a/x11-wm/fluxbox/pkg-plist +++ b/x11-wm/fluxbox/pkg-plist @@ -40,13 +40,13 @@ share/fluxbox/styles/Shade share/fluxbox/styles/Spiff share/fluxbox/styles/Twice share/fluxbox/styles/qnx-photon -@unexec rm %D/share/fluxbox/nls/lv -@unexec rm %D/share/fluxbox/nls/fr -@unexec rm %D/share/fluxbox/nls/es -@unexec rm %D/share/fluxbox/nls/en_US -@unexec rm %D/share/fluxbox/nls/en -@unexec rm %D/share/fluxbox/nls/US_ASCII -@unexec rm %D/share/fluxbox/nls/POSIX +@unexec rm %D/share/fluxbox/nls/lv 2>&1 >/dev/null || true +@unexec rm %D/share/fluxbox/nls/fr 2>&1 >/dev/null || true +@unexec rm %D/share/fluxbox/nls/es 2>&1 >/dev/null || true +@unexec rm %D/share/fluxbox/nls/en_US 2>&1 >/dev/null || true +@unexec rm %D/share/fluxbox/nls/en 2>&1 >/dev/null || true +@unexec rm %D/share/fluxbox/nls/US_ASCII 2>&1 >/dev/null || true +@unexec rm %D/share/fluxbox/nls/POSIX 2>&1 >/dev/null || true @exec ln -s lv_LV %D/share/fluxbox/nls/lv @exec ln -s fr_FR %D/share/fluxbox/nls/fr @exec ln -s es_ES %D/share/fluxbox/nls/es |
