Attachment #138797 for bug #184878

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




PORTVERSION=	1.07o
PORTREVISION=	5
CATEGORIES=	x11
MASTER_SITES=	SUNSITE/X11/desktop
MASTER_SITE_SUBDIR=	X11/desktop

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Nifty set of desktop apps, including floating buttons

LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms

USES=		imake
USE_XORG=	xaw
REINPLACE_ARGS=	-i ""

NO_STAGE=	yes
post-patch:
	@${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
	${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
		${WRKSRC}/xbackdrop/backdrops/index
	@${REINPLACE_CMD} -e 's|^update_file|void update_file|' \
		${WRKSRC}/xchooser/xchooser.c
	@${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \
		's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g'

pre-configure:
	@${RM} -f ${WRKSRC}/xbackdrop/backdrops/index?*

.include <bsd.port.mk>




--- xbackdrop/Imakefile.orig	Sat Mar  9 22:41:13 1996
+++ xbackdrop/Imakefile	Wed Nov  1 08:19:17 2000
@@ -1,26 +1,27 @@
-XBACKDROP_DIR = /usr/lib/X11/backdrops
+XCOMM
+XCOMM FBSD--SF--I'm not sure about this location--backdrops??

+ComplexProgramTargetNoMan(xbackdrop)
 
-install::	xbackdrop                                                  @@\
-	@if [ -d $(XBACKDROP_DIR) ]; then set +x; \                  @@\
-	else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi             @@\
-	cp backdrops/?* $(XBACKDROP_DIR);                            @@\
 	cp backdrops/?* $(XBACKDROP_DIR);                            @@\
-	chown root.root $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*;        @@\
-	chmod 0755 $(XBACKDROP_DIR);                                 @@\
-	chmod 0644 $(XBACKDROP_DIR)/?*;                              @@\
+install::	xbackdrop                                            @@\
+	@if [ -d $(DESTDIR)$(XBACKDROP_DIR) ]; then set +x; \                  @@\
+	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XBACKDROP_DIR)); fi             @@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) backdrops/?* $(DESTDIR)$(XBACKDROP_DIR);                            @@\
 


Return to bug 184878

Lines 5-28 Link Here

(-)x11/tycoon/Makefile (-8 / +9 lines)
5	PORTVERSION= 1.07o	5	PORTVERSION= 1.07o
6	PORTREVISION= 5	6	PORTREVISION= 5
7	CATEGORIES= x11	7	CATEGORIES= x11
8	MASTER_SITES= ${MASTER_SITE_SUNSITE}	8	MASTER_SITES= SUNSITE/X11/desktop
9	MASTER_SITE_SUBDIR= X11/desktop
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Nifty set of desktop apps, including floating buttons	11	COMMENT= Nifty set of desktop apps, including floating buttons
13		12
14	LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms	13	LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms
15		14
16	USES= imake	15	USES= imake
17	USE_XORG= xaw	16	USE_XORG= xaw
18	REINPLACE_ARGS= -i ""
19		17
20	NO_STAGE= yes
21	post-patch:	18	post-patch:
22	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~	19	@${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
23	${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
24	${WRKSRC}/xbackdrop/backdrops/index	20	${WRKSRC}/xbackdrop/backdrops/index
25	${FIND} ${WRKSRC} -name '*.c' -type f \| ${XARGS} ${REINPLACE_CMD} -e \	21	@${REINPLACE_CMD} -e 's\|^update_file\|void update_file\|' \
		22	${WRKSRC}/xchooser/xchooser.c
		23	@${FIND} ${WRKSRC} -name '*.c' -type f \| ${XARGS} ${REINPLACE_CMD} -e \
26	's,FL_REVISION>=80,FL_REVISION >= 80 \|\| FL_VERSION != 0,g'	24	's,FL_REVISION>=80,FL_REVISION >= 80 \|\| FL_VERSION != 0,g'
27		25
		26	pre-configure:
		27	@${RM} -f ${WRKSRC}/xbackdrop/backdrops/index?*
		28
28	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)x11/tycoon/files/patch-ac (-8 / +12 lines)
1	--- xbackdrop/Imakefile.orig Sat Mar 9 22:41:13 1996	1	--- xbackdrop/Imakefile.orig Sat Mar 9 22:41:13 1996
2	+++ xbackdrop/Imakefile Wed Nov 1 08:19:17 2000	2	+++ xbackdrop/Imakefile Wed Nov 1 08:19:17 2000
3	@@ -1,24 +1,28 @@	3	@@ -1,26 +1,27 @@
4	-XBACKDROP_DIR = /usr/lib/X11/backdrops	4	-XBACKDROP_DIR = /usr/lib/X11/backdrops
5	+XCOMM	5	+XCOMM
6	+XCOMM FBSD--SF--I'm not sure about this location--backdrops??	6	+XCOMM FBSD--SF--I'm not sure about this location--backdrops??
Lines 28-39 Link Here
28	+ComplexProgramTargetNoMan(xbackdrop)	28	+ComplexProgramTargetNoMan(xbackdrop)
29		29
30	-install:: xbackdrop @@\	30	-install:: xbackdrop @@\
31	+install:: xbackdrop @@\	31	- @if [ -d $(XBACKDROP_DIR) ]; then set +x; \ @@\
32	@if [ -d $(XBACKDROP_DIR) ]; then set +x; \ @@\	32	- else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi @@\
33	else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi @@\	33	- cp backdrops/?* $(XBACKDROP_DIR); @@\
34	cp backdrops/?* $(XBACKDROP_DIR); @@\
35	- chown root.root $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\	34	- chown root.root $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\
36	+ chown root:daemon $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\	35	- chmod 0755 $(XBACKDROP_DIR); @@\
37	chmod 0755 $(XBACKDROP_DIR); @@\	36	- chmod 0644 $(XBACKDROP_DIR)/?*; @@\
38	chmod 0644 $(XBACKDROP_DIR)/?*; @@\	37	+install:: xbackdrop @@\
		38	+ @if [ -d $(DESTDIR)$(XBACKDROP_DIR) ]; then set +x; \ @@\
		39	+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XBACKDROP_DIR)); fi @@\
		40	+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) backdrops/?* $(DESTDIR)$(XBACKDROP_DIR); @@\
		41
		42