c6ce65d3d0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -9,11 +9,11 @@
|
|
# Customize below to fit your system
|
|
|
|
# paths
|
|
-PREFIX = /usr/local
|
|
+PREFIX = /usr
|
|
MANPREFIX = ${PREFIX}/share/man
|
|
|
|
-X11INC = /usr/X11R6/include
|
|
-X11LIB = /usr/X11R6/lib
|
|
+X11INC = $(XBPS_CROSS_BASE)/usr/include
|
|
+X11LIB = $(XBPS_CROSS_BASE)/usr/lib
|
|
|
|
# Xinerama, comment if you don't want it
|
|
XINERAMALIBS = -lXinerama
|
|
@@ -21,7 +21,7 @@
|
|
|
|
# freetype
|
|
FREETYPELIBS = -lfontconfig -lXft
|
|
-FREETYPEINC = /usr/include/freetype2
|
|
+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2
|
|
# OpenBSD (uncomment)
|
|
#FREETYPEINC = ${X11INC}/freetype2
|
|
|
|
@@ -36,7 +36,7 @@
|
|
# flags
|
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
|
|
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
|
|
-CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
|
|
+CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
|
|
LDFLAGS = ${LIBS}
|
|
|
|
# Solaris
|
|
@@ -44,4 +44,4 @@
|
|
#LDFLAGS = ${LIBS}
|
|
|
|
# compiler and linker
|
|
-CC = cc
|
|
+#CC = cc
|