diff options
| -rw-r--r-- | x11-wm/wmii/Makefile | 36 | ||||
| -rw-r--r-- | x11-wm/wmii/files/patch-mk-common.mk | 15 | ||||
| -rw-r--r-- | x11-wm/wmii/files/patch-mk-hdr.mk | 54 | ||||
| -rw-r--r-- | x11-wm/wmii/pkg-plist | 3 |
4 files changed, 85 insertions, 23 deletions
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index 6b2a38716adc..8d5480b9ee8e 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -10,37 +10,30 @@ MASTER_SITES= http://dl.suckless.org/wmii/ MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic, minimalist window manager for X11 -LIB_DEPENDS= ixp:${PORTSDIR}/devel/libixp +LIB_DEPENDS= libixp.so:${PORTSDIR}/devel/libixp RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + CONFLICTS= wmii-3.9* USE_XORG= x11 xextproto xt xext -MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \ - INCX11="-I${LOCALBASE}/include" LIBX11="-L${LOCALBASE}/lib -lX11 -lixp" \ - CC="${CC} -c" LD="${CC}" LIBIXP="" STATIC="" \ - MAN="${MANPREFIX}/man" - -MAN1= wmii.1 wmiiloop.1 wmiir.1 +MAKE_ARGS= PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \ + INCLUDE="${LOCALBASE}/include" \ + INCX11="-I${LOCALBASE}/include" \ + LIBX11="-L${LOCALBASE}/lib -lX11 -lixp" \ + CC="${CC} -c" LD="${CC}" LIBIXP="" STATIC="" OPTIONS_DEFINE= SLIM_LAYOUT_BOX UTF8 - SLIM_LAYOUT_BOX_DESC= Build with slim layout boxes -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MUTF8} -USES+= iconv -MAKE_ARGS+= LIBICONV="${ICONV_LIB}" -.else -MAKE_ARGS+= -DNO_UTF8 -.endif +UTF8_USES= iconv +UTF8_MAKE_ARGS= LIBICONV="${ICONV_LIB}" +UTF8_MAKE_ARGS_OFF= -DNO_UTF8 -.if ${PORT_OPTIONS:MSLIM_LAYOUT_BOX} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-slim-layout-boxes -.endif +SLIM_LAYOUT_BOX_EXTRA_PATCHES= ${FILESDIR}/extra-patch-slim-layout-boxes post-patch: .SILENT ${REINPLACE_CMD} -e 's|-lfmt -lutf|$${LIBX11} & -lX11|' \ @@ -50,9 +43,6 @@ post-patch: .SILENT ${REINPLACE_CMD} -E 's| -g( -O0)?||' ${WRKSRC}/config.mk ${REINPLACE_CMD} -e 's|CFLAGS += -DIXPlint|& -DIXP_NEEDAPI=89|' \ ${WRKSRC}/config.mk -# Make actual compile/link commands appear in the build log - ${REINPLACE_CMD} -e 's|^COMPILE=|& noisycc=yes| ; \ - s|^LINK=|& noisycc=yes|' ${WRKSRC}/mk/hdr.mk # Fix brain-damaged piece of code which breaks on arches where `size_t' # is not 32-bit unsigned integer (e.g. amd64, sparc64) ${REINPLACE_CMD} -e '/wmii_strlcat/d' ${WRKSRC}/include/util.h diff --git a/x11-wm/wmii/files/patch-mk-common.mk b/x11-wm/wmii/files/patch-mk-common.mk new file mode 100644 index 000000000000..f4b290cfe07e --- /dev/null +++ b/x11-wm/wmii/files/patch-mk-common.mk @@ -0,0 +1,15 @@ +--- mk/common.mk.orig 2007-11-16 21:59:15 +0800 ++++ mk/common.mk +@@ -4,9 +4,9 @@ install: all + + MANDIRS=${MAN}/man1 + mkdirs: +- for i in ${BIN} ${ETC} ${LIBDIR} ${MANDIRS} ${INCLUDE} ${DIRS}; do \ +- test -d $$i || echo MKDIR $$i; \ +- mkdir -pm 0755 $$i; \ ++ for i in ${BIN} ${ETC} ${LIBDIR} ${MANDIRS} ${INCLUDE}; do \ ++ test -d ${DESTDIR}$$i || echo MKDIR ${DESTDIR}$$i; \ ++ mkdir -pm 0755 ${DESTDIR}$$i; \ + done + + cleandep: diff --git a/x11-wm/wmii/files/patch-mk-hdr.mk b/x11-wm/wmii/files/patch-mk-hdr.mk new file mode 100644 index 000000000000..d8cce23385f3 --- /dev/null +++ b/x11-wm/wmii/files/patch-mk-hdr.mk @@ -0,0 +1,54 @@ +--- mk/hdr.mk.orig 2007-11-16 21:59:15 +0800 ++++ mk/hdr.mk +@@ -26,32 +26,32 @@ all: + + .O.install: + echo INSTALL ${BASE}$* +- cp -f $< ${BIN}/$* +- chmod 0755 ${BIN}/$* ++ cp -f $< ${DESTDIR}${BIN}/$* ++ chmod 0755 ${DESTDIR}${BIN}/$* + .O.uninstall: + echo UNINSTALL ${BASE}$* + rm -f ${BIN}/$* + + .a.install: + echo INSTALL ${BASE}$< +- cp -f $< ${LIBDIR}/$< +- chmod 0644 ${LIBDIR}/$< ++ cp -f $< ${DESTDIR}${LIBDIR}/$< ++ chmod 0644 ${DESTDIR}${LIBDIR}/$< + .a.uninstall: + echo UNINSTALL ${BASE}$< + rm -f ${LIBDIR}/$< + + .h.install: + echo INSTALL ${BASE}$< +- cp -f $< ${INCLUDE}/$< +- chmod 0644 ${INCLUDE}/$< ++ cp -f $< ${DESTDIR}${INCLUDE}/$< ++ chmod 0644 ${DESTDIR}${INCLUDE}/$< + .h.uninstall: + echo UNINSTALL ${BASE}$< + rm -f ${INCLUDE}/$< + + .1.install: + echo INSTALL man $*'(1)' +- ${FILTER} $< >${MAN}/man1/$< +- chmod 0644 ${MAN}/man1/$< ++ ${FILTER} $< >${DESTDIR}${MAN}/man1/$< ++ chmod 0644 ${DESTDIR}${MAN}/man1/$< + .1.uninstall: + echo UNINSTALL man $*'(1)' + rm -f ${MAN}/man1/$< +@@ -69,8 +69,8 @@ install: printinstall mkdirs + depend: cleandep + + FILTER = cat +-COMPILE= CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile +-LINK= LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link ++COMPILE= noisycc=yes CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile ++LINK= noisycc=yes LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link + + include ${ROOT}/config.mk + CFLAGS += -I$$(echo ${INCPATH}|sed 's/:/ -I/g') diff --git a/x11-wm/wmii/pkg-plist b/x11-wm/wmii/pkg-plist index 266899b8e5a5..dfe4c76534ee 100644 --- a/x11-wm/wmii/pkg-plist +++ b/x11-wm/wmii/pkg-plist @@ -7,4 +7,7 @@ bin/wmiistartrc etc/wmii-3.5/rc.wmii etc/wmii-3.5/welcome etc/wmii-3.5/wmiirc +man/man1/wmii.1.gz +man/man1/wmiiloop.1.gz +man/man1/wmiir.1.gz @dirrm etc/wmii-3.5 |