Attachment #254981 for bug #282583

View | Details | Raw Unified | Return to bug 282583
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/x11/tabbed/Makefile (-10 / +13 lines)
1	PORTNAME= tabbed	1	PORTNAME= tabbed
2	PORTVERSION= 0.6	2	DISTVERSION= 0.8
3	PORTREVISION= 1
4	CATEGORIES= x11	3	CATEGORIES= x11
5	MASTER_SITES= http://dl.suckless.org/tools/	4	MASTER_SITES= http://dl.suckless.org/tools/
6		5
Lines 9-24 COMMENT= Tabbed frontend to Xembed-aware applications Link Here
9	WWW= https://tools.suckless.org/tabbed	8	WWW= https://tools.suckless.org/tabbed
10		9
11	LICENSE= MIT	10	LICENSE= MIT
		11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	USES= xorg	13	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
14	USE_XORG= x11
15		14
16	OPTIONS_DEFINE= DOCS	15	USES= localbase:ldflags pkgconfig xorg
		16	USE_XORG= x11 xft xorgproto
		17	MAKE_ARGS= PREFIX="${PREFIX}" CC="${CC}"
17		18
18	PLIST_FILES= bin/tabbed \	19	PLIST_FILES= bin/tabbed \
19	share/man/man1/tabbed.1.gz	20	bin/xembed \
20	PORTDOCS= LICENSE README	21	share/man/man1/tabbed.1.gz \
21	MAKE_ARGS= PREFIX="${PREFIX}" CC="${CC}"	22	share/man/man1/xembed.1.gz
		23	PORTDOCS= README
		24
		25	OPTIONS_DEFINE= DOCS
22		26
23	pre-everything::	27	pre-everything::
24	@${ECHO_MSG} "You can build tabbed with your own config.h using the TABBED_CONF knob:"	28	@${ECHO_MSG} "You can build tabbed with your own config.h using the TABBED_CONF knob:"
Lines 31-37 post-extract: Link Here
31	.endif	35	.endif
32		36
33	post-install:	37	post-install:
34	@${MKDIR} ${STAGEDIR}${DOCSDIR}	38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
35	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
36		39
37	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/x11/tabbed/distinfo (-2 / +3 lines)
1	SHA256 (tabbed-0.6.tar.gz) = 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42	1	TIMESTAMP = 1730835184
2	SIZE (tabbed-0.6.tar.gz) = 12926	2	SHA256 (tabbed-0.8.tar.gz) = 95bdffccb071083068d2b555c2524e9c7c57c9b64494d46c697e678d49a0a3d7
		3	SIZE (tabbed-0.8.tar.gz) = 13970




--- Makefile.orig	2024-11-06 06:26:09 UTC
+++ Makefile
@@ -9,7 +9,8 @@ DOCPREFIX = ${PREFIX}/share/doc/${NAME}
 DOCPREFIX = ${PREFIX}/share/doc/${NAME}
 
 # use system flags.
-TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CFLAGS}
+FREETYPE_CFLAGS!=pkg-config --cflags freetype2
+TABBED_CFLAGS = -I/usr/X11R6/include ${FREETYPE_CFLAGS} ${CFLAGS}
 TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
 TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700L
 




--- config.mk.orig	2014-01-21 18:22:03 UTC
+++ config.mk
@@ -8,12 +8,12 @@ MANPREFIX = ${PREFIX}/share/man
 MANPREFIX = ${PREFIX}/share/man
 
 # includes and libs
-INCS = -I. -I/usr/include
-LIBS = -L/usr/lib -lc -lX11
+INCS = -I. -I${LOCALBASE}/include
+LIBS = -L${LOCALBASE}/lib -lX11
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+CFLAGS += -Wall ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 
 # Solaris

Return to bug 282583

Added Link Here

(-)b/x11/tabbed/files/patch-Makefile (+12 lines)
1	--- Makefile.orig 2024-11-06 06:26:09 UTC
2	+++ Makefile
3	@@ -9,7 +9,8 @@ DOCPREFIX = ${PREFIX}/share/doc/${NAME}
4	DOCPREFIX = ${PREFIX}/share/doc/${NAME}
5
6	# use system flags.
7	-TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CFLAGS}
8	+FREETYPE_CFLAGS!=pkg-config --cflags freetype2
9	+TABBED_CFLAGS = -I/usr/X11R6/include ${FREETYPE_CFLAGS} ${CFLAGS}
10	TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
11	TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700L
12

Removed Link Here

(-)a/x11/tabbed/files/patch-config.mk (-18 lines)
1	--- config.mk.orig 2014-01-21 18:22:03 UTC
2	+++ config.mk
3	@@ -8,12 +8,12 @@ MANPREFIX = ${PREFIX}/share/man
4	MANPREFIX = ${PREFIX}/share/man
5
6	# includes and libs
7	-INCS = -I. -I/usr/include
8	-LIBS = -L/usr/lib -lc -lX11
9	+INCS = -I. -I${LOCALBASE}/include
10	+LIBS = -L${LOCALBASE}/lib -lX11
11
12	# flags
13	CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
14	-CFLAGS = -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
15	+CFLAGS += -Wall ${INCS} ${CPPFLAGS}
16	LDFLAGS = -s ${LIBS}
17
18	# Solaris