Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
dmenu: fix patch
fix case of library on case-sensitive filesystems
fix ${prefix} - change to a @@Prefix@@ and reinplace
  • Loading branch information
kencu committed Feb 20, 2019
1 parent 402a742 commit b70a50f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions x11/dmenu/Portfile
Expand Up @@ -33,6 +33,9 @@ use_configure no
if {${os.platform} eq "darwin" && ${os.major} < 11} {
depends_lib-append path:lib/libMacportsLegacySupport.dylib:legacy-support
patchfiles-append patch-dmenu-legacysupport.diff
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/config.mk
}
}

build.args PREFIX=${prefix} \
Expand Down
4 changes: 2 additions & 2 deletions x11/dmenu/files/patch-dmenu-legacysupport.diff
Expand Up @@ -8,8 +8,8 @@ index 0929b4a..81ce51e 100644
# includes and libs
-INCS = -I$(X11INC) -I$(FREETYPEINC)
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+INCS = -I$(X11INC) -I$(FREETYPEINC) -I${prefix}/include/LegacySupport
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lmacportslegacysupport
+INCS = -I@@PREFIX@@/include/LegacySupport -I$(X11INC) -I$(FREETYPEINC)
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lMacportsLegacySupport

# flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)

0 comments on commit b70a50f

Please sign in to comment.