diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2003-07-14 02:53:03 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2003-07-14 02:53:03 +0000 |
| commit | b185046be2ec03555daaf4f26d38542c403a9955 (patch) | |
| tree | 0274ce607614533de66837fc1f70d4c35770d9e1 /x11/wmappl | |
| parent | Update to 0.2.3 (diff) | |
get rid of libgnugetopt dependency for -CURRENT,
use USE_GETOPT_LONG instead.
Notes
Notes:
svn path=/head/; revision=84842
Diffstat (limited to 'x11/wmappl')
| -rw-r--r-- | x11/wmappl/Makefile | 10 | ||||
| -rw-r--r-- | x11/wmappl/files/patch-Makefile | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile index 155ccf3a03ba..43eaebed5cba 100644 --- a/x11/wmappl/Makefile +++ b/x11/wmappl/Makefile @@ -7,6 +7,7 @@ PORTNAME= wmappl PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= x11 windowmaker MASTER_SITES= http://www.upl.cs.wisc.edu/~charkins/wmappl/ .ifndef(NOICONS) @@ -17,11 +18,12 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= od@iclub.nsu.ru COMMENT= An application launcher dockapp similar to wmbutton -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt - +USE_GETOPT_LONG=yes USE_X_PREFIX= yes USE_XPM= yes -MAKE_ENV= DATADIR="${DATADIR}" +MAKE_ENV= DATADIR="${DATADIR}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" ICONSDIST= 16x16xpms.tar.gz icons_16x16.tar.gz smallicons.tar.gz .ifndef(NOICONS) PLIST_SUB= ICONS="" @@ -49,7 +51,7 @@ post-install: @${ECHO_CMD} "" @${ECHO_CMD} "===> Installing icons to ${DATADIR} directory" @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${DATADIR} + @(cd ${WRKSRC}/icons; ${INSTALL_DATA} *.xpm ${DATADIR}) .endif .ifndef(NOPORTDOCS) @${ECHO_CMD} "===> Installing README as ${DOCSDIR}/README" diff --git a/x11/wmappl/files/patch-Makefile b/x11/wmappl/files/patch-Makefile index df195e311626..aeeeba25a84a 100644 --- a/x11/wmappl/files/patch-Makefile +++ b/x11/wmappl/files/patch-Makefile @@ -11,14 +11,14 @@ -DESTDIR = /usr/X11R6/bin -ICONDIR = /usr/share/icons/wmappl +CFLAGS += -DICONPATH=\"${DATADIR}\" -+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include -I${LOCALBASE}/include -+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib ++INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include ${CPPFLAGS} ++LIBDIR = -L${X11BASE}/lib +DESTDIR = ${X11BASE}/bin +ICONDIR = ${DATADIR} # for linux -LIBS = -lXpm -lX11 -lXext -+LIBS = -lXpm -lX11 -lXext -lgnugetopt ++LIBS = -lXpm -lX11 -lXext # for Solaris # LIBS = -lXpm -lX11 -lXext -lsocket @@ -27,7 +27,7 @@ $(TARGET): $(OBJS) - $(CC) $(CFLAGS) -o $(TARGET) $^ $(INCDIR) $(LIBDIR) $(LIBS) -+ $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(INCDIR) $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(INCDIR) $(LDFLAGS) $(LIBDIR) $(LIBS) clean: for i in $(OBJS) ; do \ |