Index: head/x11-wm/wmakerconf/Makefile =================================================================== --- head/x11-wm/wmakerconf/Makefile (revision 546139) +++ head/x11-wm/wmakerconf/Makefile (revision 546140) @@ -1,52 +1,50 @@ # Created by: Dominik Rothert # $FreeBSD$ -# $MCom: ports/x11-wm/wmakerconf/Makefile,v 1.2 2006/10/05 07:31:44 mezz Exp $ PORTNAME= wmakerconf PORTVERSION= 2.12 PORTREVISION= 11 CATEGORIES= x11-wm MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Configuration tool for Window Maker LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libWINGs.so:x11-wm/windowmaker RUN_DEPENDS= rpm:archivers/rpm4 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= gettext pkgconfig perl5 gmake gnome shebangfix xorg USE_GNOME= gtk20 SHEBANG_FILES= scripts/getfile.pl.in scripts/upgrade.pl.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wmakerdataprefix="${LOCALBASE}/share" \ --with-wmakeretcprefix="${LOCALBASE}/share" USE_XORG= x11 -LIBS+= -L${LOCALBASE}/lib -lX11 +LIBS= -L${LOCALBASE}/lib -lX11 -lWUtil post-extract: @${FIND} ${WRKSRC} -name "*.gmo" -delete post-patch: - @${REINPLACE_CMD} -e 's|lynx wget|lynx fetch|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$(prefix)/share/locale|${STAGEDIR}${PREFIX}/share/locale|g' \ ${WRKSRC}/data/po/Makefile.am ${WRKSRC}/data/po/Makefile.in \ ${WRKSRC}/po/Makefile.in.in @${REINPLACE_CMD} -e '/chmod 0/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E '/\/usr\/share/d; \ s|/usr/local|${LOCALBASE}|g ; \ s|/usr/X11R6|${LOCALBASE}|g; \ s|(share/pixmaps.*),|\1|g' \ ${WRKSRC}/data/WMWmakerconf* .for file in data/po/ja.po po/ja.po @${REINPLACE_CMD} -e 's|JISX-0208-1983-0|euc-jp|g' ${WRKSRC}/${file} .endfor @${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ '/WMWritePropListToFile/s|,[[:space:]]YES||g' .include Index: head/x11-wm/wmakerconf/files/patch-configure =================================================================== --- head/x11-wm/wmakerconf/files/patch-configure (nonexistent) +++ head/x11-wm/wmakerconf/files/patch-configure (revision 546140) @@ -0,0 +1,38 @@ +--- configure.orig 2007-04-12 10:52:31 UTC ++++ configure +@@ -3458,7 +3458,7 @@ fi + libwmfun="no" + # Checks for wraster lib + # Extract the first word of "get-wings-flags", so it can be a program name with args. +-set dummy get-wings-flags; ac_word=$2 ++set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_wraster+set}" = set; then +@@ -3486,7 +3486,7 @@ done + ;; + esac + fi +-wraster=$ac_cv_path_wraster ++wraster="$ac_cv_path_wraster wrlib" + + if test -n "$wraster"; then + echo "$as_me:$LINENO: result: $wraster" >&5 +@@ -3497,7 +3497,7 @@ echo "${ECHO_T}no" >&6 + fi + + if test -n "$wraster"; then +- WRASTERLIBS=`($wraster --ldflags --libs 2>/dev/null || $wraster --lflags --libs) | xargs` ++ WRASTERLIBS=`$wraster --libs` + WRASTERINCLUDES=`$wraster --cflags` + MKPREVIEW="mkpreview" + OLD_LDFLAGS="$LDFLAGS" +@@ -5818,7 +5818,7 @@ echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +- for ac_prog in lynx wget ++ for ac_prog in lynx fetch + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 Property changes on: head/x11-wm/wmakerconf/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property