diff options
30 files changed, 73 insertions, 103 deletions
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile index b55aceb8ac83..5902fe5f3fed 100644 --- a/x11/deskmenu/Makefile +++ b/x11/deskmenu/Makefile @@ -16,8 +16,7 @@ USES= gmake USE_GNOME= gtk12 USE_CSTD= gnu89 -NO_STAGE= yes post-install: - ${STRIP_CMD} ${PREFIX}/bin/deskmenu + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/deskmenu .include <bsd.port.mk> diff --git a/x11/deskmenu/files/patch-Makefile b/x11/deskmenu/files/patch-Makefile index 51243cf6b1f8..ebf5b6df1902 100644 --- a/x11/deskmenu/files/patch-Makefile +++ b/x11/deskmenu/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Jan 19 15:41:43 2003 -+++ Makefile Sun Jan 19 15:42:30 2003 +--- Makefile.orig 2001-05-22 18:44:52.000000000 +0800 ++++ Makefile 2014-01-10 14:41:23.000000000 +0800 @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -g -O2 -Wall `gtk-config --cflags` @@ -12,7 +12,7 @@ LDPATH = -L$(XROOT)/lib PROG = deskmenu -@@ -10,7 +9,6 @@ +@@ -10,7 +9,6 @@ HEADERS = $(PROG).h RCFILE = -DRCFILE=\".deskmenurc\" DEBUG = #-DDEBUG DEFINES = $(RCFILE) $(DEBUG) @@ -20,12 +20,12 @@ OBJS = $(PROG).o popup.o workspaces.o windows.o -@@ -23,7 +21,7 @@ +@@ -23,7 +21,7 @@ $(OBJS): %.o: %.c $(HEADERS) $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ install: all - install $(PROG) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) $(PROG) $(PREFIX)/bin ++ $(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(PREFIX)/bin clean: rm -f $(PROG) $(OBJS) diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile index 8c9b036ffeba..a61aaf8b5156 100644 --- a/x11/gcb/Makefile +++ b/x11/gcb/Makefile @@ -16,7 +16,6 @@ USES= pkgconfig USE_BZIP2= yes USE_GNOME= gtk20 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|#!/bin/bash|#!${SH}|' \ ${WRKSRC}/configure @@ -25,10 +24,11 @@ post-patch: ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/icons + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \ - ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps .include <bsd.port.mk> diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index f4be373e41f6..b8518cb2c654 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -22,9 +22,6 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/bin \ --without-gnome USE_LDCONFIG= yes -MAN8= gdkxft_sysinstall.8 - -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -44,8 +41,8 @@ post-patch: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11/gdkxft/pkg-plist b/x11/gdkxft/pkg-plist index 64e82201a818..207773d5ec77 100644 --- a/x11/gdkxft/pkg-plist +++ b/x11/gdkxft/pkg-plist @@ -3,5 +3,6 @@ etc/gdkxft.conf lib/libgdkxft.a lib/libgdkxft.la lib/libgdkxft.so -%%PORTDOCS%%share/doc/gdkxft/README -%%PORTDOCS%%@dirrm share/doc/gdkxft +man/man8/gdkxft_sysinstall.8.gz +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile index 4c35adfd9565..6ddfc62bf214 100644 --- a/x11/gmessage/Makefile +++ b/x11/gmessage/Makefile @@ -13,5 +13,4 @@ COMMENT= Gtk+ clone of xmessage. displays a given text in a X11 window PLIST_FILES= bin/gmessage USE_GNOME= gtk12 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/gmessage/files/patch-aa b/x11/gmessage/files/patch-aa index 6d6e4d81ffee..ee720e257893 100644 --- a/x11/gmessage/files/patch-aa +++ b/x11/gmessage/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Thu May 27 19:58:06 1999 -+++ Makefile Sat Jul 1 17:48:44 2000 +--- Makefile.orig 1999-05-27 18:58:06.000000000 +0800 ++++ Makefile 2014-01-10 14:20:30.000000000 +0800 @@ -1,6 +1,6 @@ -CC = gcc -CFLAGS = `gtk-config --cflags` @@ -10,12 +10,12 @@ all: gmessage -@@ -8,7 +8,7 @@ +@@ -8,7 +8,7 @@ gmessage: gmessage.c $(CC) $(CFLAGS) gmessage.c -o gmessage $(OBJS) $(LDLIBS) install: gmessage - cp ./gmessage /usr/local/bin -+ ${BSD_INSTALL_PROGRAM} gmessage ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} gmessage $(DESTDIR)${PREFIX}/bin clean: $(RM) *.o core gmessage diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile index bfd3a2a8e497..2112ab557846 100644 --- a/x11/gtk-theme-switch/Makefile +++ b/x11/gtk-theme-switch/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtk-theme-switch PORTVERSION= 1.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= http://www.muhri.net/ PKGNAMESUFFIX= 1 @@ -14,15 +14,12 @@ COMMENT= Command line tool for switching GTK+ themes USE_GNOME= gtk12 USES= gmake -MAN1= gtk-theme-switch.1 - -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${PREFIX}/share/gtk-theme-switch - ${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/gtk-theme-switch/README + ${MKDIR} ${STAGEDIR}${PREFIX}/${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/readme ${STAGEDIR}${PREFIX}/${DOCSDIR}/README .endif .include <bsd.port.mk> diff --git a/x11/gtk-theme-switch/files/patch-aa b/x11/gtk-theme-switch/files/patch-aa index c8e6569c3131..6bf39f4ad6c3 100644 --- a/x11/gtk-theme-switch/files/patch-aa +++ b/x11/gtk-theme-switch/files/patch-aa @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.orig Fri Apr 13 17:57:24 2001 -+++ Makefile Tue Apr 17 09:31:20 2001 +--- Makefile.orig 2003-06-11 14:02:59.000000000 +0800 ++++ Makefile 2014-01-10 14:11:54.000000000 +0800 @@ -1,7 +1,8 @@ -GCC = cc -PREFIX=/usr/local @@ -16,18 +13,19 @@ $FreeBSD$ VERSION = 1.0.1 all: switch -@@ -12,11 +13,10 @@ +@@ -12,11 +13,10 @@ clean: -rm -f switch *~ install: all - strip switch - mkdir -p ${PREFIX}/bin +- mkdir -p ${PREFIX}/bin - mkdir -p ${PREFIX}/man - install -c switch ${PREFIX}/bin - install -c switch.1 ${PREFIX}/man -+ mkdir -p ${PREFIX}/man/man1 -+ $(BSD_INSTALL_PROGRAM) switch ${PREFIX}/bin/gtk-theme-switch -+ $(BSD_INSTALL_MAN) switch.1 ${PREFIX}/man/man1/gtk-theme-switch.1 ++ mkdir -p $(DESTDIR)${PREFIX}/bin ++ mkdir -p $(DESTDIR)${PREFIX}/man/man1 ++ $(BSD_INSTALL_PROGRAM) switch $(DESTDIR)${PREFIX}/bin/gtk-theme-switch ++ $(BSD_INSTALL_MAN) switch.1 $(DESTDIR)${PREFIX}/man/man1/gtk-theme-switch.1 dist: clean rm -rf /tmp/gtk-theme-switch-$(VERSION) diff --git a/x11/gtk-theme-switch/pkg-plist b/x11/gtk-theme-switch/pkg-plist index 2e77a2b96c2b..4afb76dbb25e 100644 --- a/x11/gtk-theme-switch/pkg-plist +++ b/x11/gtk-theme-switch/pkg-plist @@ -1,3 +1,4 @@ bin/gtk-theme-switch -%%PORTDOCS%%share/gtk-theme-switch/README -@dirrm share/gtk-theme-switch +man/man1/gtk-theme-switch.1.gz +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile index 4b65fd2a2e27..b65543a870f1 100644 --- a/x11/gtk-theme-switch2/Makefile +++ b/x11/gtk-theme-switch2/Makefile @@ -14,8 +14,6 @@ USES= gmake pkgconfig USE_XORG= x11 USE_GNOME= gtk20 -MAN1= switch2.1 -PLIST_FILES= bin/switch2 +PLIST_FILES= bin/switch2 man/man1/switch2.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/gtk-theme-switch2/files/patch-Makefile b/x11/gtk-theme-switch2/files/patch-Makefile index 1f819ef5a513..dfcf938eeb7b 100644 --- a/x11/gtk-theme-switch2/files/patch-Makefile +++ b/x11/gtk-theme-switch2/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Jun 11 01:16:36 2003 -+++ Makefile Mon Dec 17 23:11:09 2007 +--- Makefile.orig 2003-06-11 13:16:36.000000000 +0800 ++++ Makefile 2014-01-10 09:40:04.000000000 +0800 @@ -1,13 +1,13 @@ -GCC = cc -PREFIX=/usr/local @@ -21,14 +21,18 @@ ${GCC} -o switch2 switch.c ${CFLAGS} ${LIBS} clean: -@@ -17,8 +17,8 @@ +@@ -15,10 +15,10 @@ clean: + + install: all strip switch2 - mkdir -p ${PREFIX}/bin - mkdir -p ${PREFIX}/man +- mkdir -p ${PREFIX}/bin +- mkdir -p ${PREFIX}/man - install -c switch2 ${PREFIX}/bin - install -c switch.1 ${PREFIX}/man -+ install -c -m 555 switch2 ${PREFIX}/bin -+ install -c -m 444 switch.1 ${PREFIX}/man/man1/switch2.1 ++ mkdir -p $(DESTDIR)${PREFIX}/bin ++ mkdir -p $(DESTDIR)${PREFIX}/man ++ install -c -m 555 switch2 $(DESTDIR)${PREFIX}/bin ++ install -c -m 444 switch.1 $(DESTDIR)${PREFIX}/man/man1/switch2.1 dist: clean rm -rf /tmp/gtk-theme-switch-$(VERSION) diff --git a/x11/lsw/Makefile b/x11/lsw/Makefile index b36418ae4ae6..c6ece3e4673f 100644 --- a/x11/lsw/Makefile +++ b/x11/lsw/Makefile @@ -11,21 +11,19 @@ COMMENT= Lists the titles of all running X windows to stdout, similar to ls(1) MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ X11INC="${LOCALBASE}/include" CC="${CC}" -PLIST_FILES= bin/lsw +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -MAN1= lsw.1 USE_XORG= x11 xt xproto xext -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\ -e 's|-DHAVE_SHADOW_H||' ${WRKSRC}/config.mk do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index cdb6d1ccf24f..4f5a337e5ad3 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -19,7 +19,6 @@ CONFLICTS= mrxvt-0.5.* GNU_CONFIGURE= yes USE_XORG= x11 -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 900007 @@ -49,8 +48,6 @@ PORTDOCS= TIPS \ mrxvtset.pl .endif -MAN1= mrxvt.1 - pre-everything:: @${ECHO_MSG} "=========================================>" @${ECHO_MSG} "For Japanese support use make -DWITH_JAPANESE install" @@ -64,6 +61,6 @@ post-patch: .endif post-install: - ${CHMOD} 4511 ${PREFIX}/bin/mrxvt + ${CHMOD} 4511 ${STAGEDIR}${PREFIX}/bin/mrxvt .include <bsd.port.post.mk> diff --git a/x11/mrxvt/pkg-plist b/x11/mrxvt/pkg-plist index bd2d21208b2e..b8ae961a7b1c 100644 --- a/x11/mrxvt/pkg-plist +++ b/x11/mrxvt/pkg-plist @@ -1,4 +1,5 @@ bin/mrxvt +man/man1/mrxvt.1.gz share/pixmaps/mrxvt-csh.png share/pixmaps/mrxvt-csh.xpm share/pixmaps/mrxvt-root.png diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile index 472fdd689ed3..d4840ce99e77 100644 --- a/x11/multi-aterm/Makefile +++ b/x11/multi-aterm/Makefile @@ -15,7 +15,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS=--with-xpm=${LOCALBASE} DOCS= AUTHORS ChangeLog INSTALL TODO -MAN1= multi-aterm.1 .if defined(WITH_UTMP) CONFIGURE_ARGS+= --enable-utmp @@ -25,7 +24,6 @@ CONFIGURE_ARGS+= --enable-utmp CONFIGURE_ARGS+= --enable-wtmp .endif -NO_STAGE= yes pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "You can specify the following options:" @@ -34,8 +32,8 @@ pre-everything:: .if !defined(NOPORTDOCS) post-install: - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11/multi-aterm/pkg-plist b/x11/multi-aterm/pkg-plist index ecc8e2ee0491..d8f19caf0616 100644 --- a/x11/multi-aterm/pkg-plist +++ b/x11/multi-aterm/pkg-plist @@ -1,5 +1,6 @@ @comment $FreeBSD$ bin/multi-aterm +man/man1/multi-aterm.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile index 1ed81a146a7d..d9d51321afba 100644 --- a/x11/mxico/Makefile +++ b/x11/mxico/Makefile @@ -16,14 +16,12 @@ COMMENT= Rotating Object on the screen (Zalgaller polyhedra) USES= imake USE_XORG= x11 xext WRKSRC= ${WRKDIR}/${PORTNAME} -MAN1= mxico.1 -NO_STAGE= yes post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/READMEj ${DOCSDIR}) - @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/README ${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/READMEj ${STAGEDIR}${DOCSDIR}) + @(cd ${WRKSRC}; ${INSTALL_DATA} polyhedron/README ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> diff --git a/x11/mxico/pkg-plist b/x11/mxico/pkg-plist index 22971e5f3bfc..797674a1e880 100644 --- a/x11/mxico/pkg-plist +++ b/x11/mxico/pkg-plist @@ -1,4 +1,5 @@ bin/mxico +man/man1/mxico.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/READMEj %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile index aae54f13173f..22fc8ab7f063 100644 --- a/x11/numlockx/Makefile +++ b/x11/numlockx/Makefile @@ -20,5 +20,4 @@ PLIST_FILES= bin/numlockx CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile index 1950c4f623f7..e12cf1e56f21 100644 --- a/x11/peeper/Makefile +++ b/x11/peeper/Makefile @@ -16,14 +16,13 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} `${IMLIB_CONFIG} --cflags-gdk`" \ LIBS="`${IMLIB_CONFIG} --libs-gdk`" ALL_TARGET= peeper -NO_STAGE= yes .include <bsd.port.options.mk> do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/peeper ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/peeper ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile index acb7f2fa36c3..b4378eb98c82 100644 --- a/x11/rxvt-devel/Makefile +++ b/x11/rxvt-devel/Makefile @@ -41,9 +41,6 @@ CONFIGURE_ARGS= --enable-utmp --enable-lastlog \ --enable-mousewheel --disable-languages USE_LDCONFIG= yes -MAN1= rxvt.1 - -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OSVERSION} >= 900007 @@ -144,6 +141,6 @@ post-patch: ${WRKSRC}/src/Makefile.in post-install: - @${CHMOD} 4711 ${PREFIX}/bin/rxvt + @${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/rxvt .include <bsd.port.post.mk> diff --git a/x11/rxvt-devel/pkg-plist b/x11/rxvt-devel/pkg-plist index 68c36aa2ec6e..acabb598e7bd 100644 --- a/x11/rxvt-devel/pkg-plist +++ b/x11/rxvt-devel/pkg-plist @@ -5,3 +5,4 @@ lib/librxvt.a lib/librxvt.la lib/librxvt.so lib/librxvt.so.1 +man/man1/rxvt.1.gz diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index c84f9b0ba311..8b50184e1cbd 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -31,11 +31,8 @@ CONFIGURE_ARGS= --enable-ttygid \ --with-xpm --enable-xpm-background \ --with-xpm-includes=${LOCALBASE}/include/X11 \ --with-xpm-library=${LOCALBASE}/lib -MAN1= rxvt.1 -PLIST_FILES= bin/rxvt +PLIST_FILES= bin/rxvt man/man1/${PORTNAME}.1.gz - -NO_STAGE= yes .include <bsd.port.pre.mk> # fails to build with new utmpx @@ -96,6 +93,6 @@ post-patch: @${REINPLACE_CMD} -e 's|getpt()|posix_openpt(0)|' ${WRKSRC}/configure post-install: - @${CHMOD} 4711 ${PREFIX}/bin/rxvt + @${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/rxvt .include <bsd.port.post.mk> diff --git a/x11/settitle/Makefile b/x11/settitle/Makefile index 4d293f932993..13e85a0636f2 100644 --- a/x11/settitle/Makefile +++ b/x11/settitle/Makefile @@ -11,9 +11,6 @@ COMMENT= Program for setting the title of terminal emulator windows WRKSRC= ${WRKDIR}/settitle -MAN1= settitle.1 -MANCOMPRESSED= maybe -PLIST_FILES= bin/settitle +PLIST_FILES= bin/settitle man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile index 6997543dc4d4..63f49cf78ef2 100644 --- a/x11/sisctrl/Makefile +++ b/x11/sisctrl/Makefile @@ -18,8 +18,6 @@ CONFIGURE_ARGS= --with-xv-path=${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES= bin/sisctrl -MAN1= sisctrl.1x +PLIST_FILES= bin/sisctrl man/man1/sisctrl.1x.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile index 64d5a9b60fa4..c42d59a1e5af 100644 --- a/x11/xfishtank/Makefile +++ b/x11/xfishtank/Makefile @@ -15,7 +15,6 @@ USES= imake USE_XORG= x11 xext WRKSRC= ${WRKDIR}/xfishtank2.0 -NO_STAGE= yes post-patch: cd ${WRKDIR}/xfishtank2.0; make clean diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile index 61355b22d843..570122cadda7 100644 --- a/x11/xtermcontrol/Makefile +++ b/x11/xtermcontrol/Makefile @@ -17,8 +17,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include -PLIST_FILES= bin/xtermcontrol -MAN1= ${PORTNAME}.1 +PLIST_FILES= bin/xtermcontrol man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile index b7d3516d4fde..f4cb31fe9eab 100644 --- a/x11/xtrlock/Makefile +++ b/x11/xtrlock/Makefile @@ -22,10 +22,9 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lcrypt MAN1= xtrlock.1 -PLIST_FILES= bin/xtrlock +PLIST_FILES= bin/xtrlock man/man1/${PORTNAME}.1.gz BINMODE= 4555 -NO_STAGE= yes post-extract: @${LN} -sf xtrlock.man ${WRKSRC}/xtrlock.1 @@ -38,7 +37,7 @@ do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} -o xtrlock xtrlock.c ${LDFLAGS}) do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} xtrlock ${PREFIX}/bin) - (cd ${WRKSRC} && ${INSTALL_MAN} xtrlock.1 ${MANPREFIX}/man/man1) + (cd ${WRKSRC} && ${INSTALL_PROGRAM} xtrlock ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} xtrlock.1 ${STAGEDIR}${MANPREFIX}/man/man1) .include <bsd.port.mk> diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile index 4e6f589f6bb3..9e1d6509d9ea 100644 --- a/x11/xxkb/Makefile +++ b/x11/xxkb/Makefile @@ -16,12 +16,10 @@ USES= iconv imake USE_XORG= xpm WRKSRC= ${WRKDIR}/${PORTNAME} -MAN1= ${PORTNAME}.1 PORTDOCS= README CHANGES.ru README.ru OPTIONS_DEFINE= LIBRSVG2 DOCS -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MLIBRSVG2} @@ -37,8 +35,8 @@ post-build: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.post.mk> |