Attachment #152035 for bug #197006

Lines 23-29 Link Here

(-)Makefile (-8 / +4 lines)
23	OPTIONS_SUB= yes	23	OPTIONS_SUB= yes
24	CGDISK_DESC= Curses-based interactive program	24	CGDISK_DESC= Curses-based interactive program
25	UTF16_DESC= Support for Unicode partition names	25	UTF16_DESC= Support for Unicode partition names
		26	UTF16_CPPFLAGS+= -DUSE_UTF16
		27	UTF16_LDFLAGS+= -licuio
26		28
		29	CPPFLAGS+= -I${LOCALBASE}/include
		30	LDFLAGS+= -I${LOCALBASE}/include
27	MAKEFILE= Makefile.freebsd	31	MAKEFILE= Makefile.freebsd
28		32
29	PROGRAM_LIST= fixparts gdisk sgdisk	33	PROGRAM_LIST= fixparts gdisk sgdisk
Lines 40-57 Link Here
40	.endif	44	.endif
41		45
42	post-patch:	46	post-patch:
43	${REINPLACE_CMD} -e 's\|/usr/include/\|\|' ${WRKSRC}/guid.h
44	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' ${WRKSRC}/${MAKEFILE}
45
46	.if ! ${PORT_OPTIONS:MCGDISK}	47	.if ! ${PORT_OPTIONS:MCGDISK}
47	${REINPLACE_CMD} -e '/^all:/s\| cgdisk\|\|' ${WRKSRC}/${MAKEFILE}	48	${REINPLACE_CMD} -e '/^all:/s\| cgdisk\|\|' ${WRKSRC}/${MAKEFILE}
48	.endif	49	.endif
49		50
50	.if ! ${PORT_OPTIONS:MUTF16}
51	${REINPLACE_CMD} -e 's\| -D USE_UTF16\|\|' \
52	-e 's\| -licuio\|\|' ${WRKSRC}/${MAKEFILE}
53	.endif
54
55	do-install:	51	do-install:
56	.for i in ${PROGRAM_LIST}	52	.for i in ${PROGRAM_LIST}
57	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin	53	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin




--- Makefile.freebsd	2011-09-11 00:51:13.000000000 +0000
+++ Makefile.freebsd	2015-01-22 02:35:12.000000000 -0700
@@ -1,8 +1,8 @@
-CC=gcc
-CXX=g++
+CC?=gcc
+CXX?=g++
 CFLAGS+=-D_FILE_OFFSET_BITS=64
 #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include
-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include 
+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 ${CPPFLAGS}
 LDFLAGS+=
 LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
 MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
@@ -15,18 +15,18 @@
 
 gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
 #	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o -L/usr/local/lib $(LDFLAGS) -licuio -luuid -o gdisk
-	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o -L/usr/local/lib $(LDFLAGS) -luuid -o gdisk
+	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
 
 cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
 #	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/local/lib $(LDFLAGS) -licuio -luuid -lncurses -o cgdisk
-	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/local/lib $(LDFLAGS) -luuid -lncurses -o cgdisk
+	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
 
 sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
 #	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o -L/usr/local/lib $(LDFLAGS) -luuid -licuio -lpopt -o sgdisk
-	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o -L/usr/local/lib $(LDFLAGS) -luuid -lpopt -o sgdisk
+	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
 
 fixparts: $(MBR_LIB_OBJS) fixparts.o
-	$(CXX) $(MBR_LIB_OBJS) fixparts.o -L/usr/local/lib $(LDFLAGS) -o fixparts
+	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
 
 lint:	#no pre-reqs
 	lint $(SRCS)

Return to bug 197006

Lines 1-10 Link Here

(-)files/patch-Makefile.freebsd (-4 / +31 lines)
1	--- Makefile.freebsd 2011-09-11 00:51:13.000000000 +0000	1	--- Makefile.freebsd 2011-09-11 00:51:13.000000000 +0000
2	+++ Makefile.freebsd 2011-09-18 20:22:41.000000000 +0000	2	+++ Makefile.freebsd 2015-01-22 02:35:12.000000000 -0700
3	@@ -1,5 +1,5 @@	3	@@ -1,8 +1,8 @@
4	-CC=gcc	4	-CC=gcc
5	-CXX=g++	5	-CXX=g++
6	+CC?=gcc	6	+CC?=gcc
7	+CXX?=g++	7	+CXX?=g++
8	CFLAGS+=-D_FILE_OFFSET_BITS=64	8	CFLAGS+=-D_FILE_OFFSET_BITS=64
9	CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include	9	#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include
10	#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include	10	-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include
		11	+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 ${CPPFLAGS}
		12	LDFLAGS+=
		13	LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
		14	MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
		15	@@ -15,18 +15,18 @@
		16
		17	gdisk: $(LIB_OBJS) gdisk.o gpttext.o
		18	# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o -L/usr/local/lib $(LDFLAGS) -licuio -luuid -o gdisk
		19	- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o -L/usr/local/lib $(LDFLAGS) -luuid -o gdisk
		20	+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
		21
		22	cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
		23	# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/local/lib $(LDFLAGS) -licuio -luuid -lncurses -o cgdisk
		24	- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/local/lib $(LDFLAGS) -luuid -lncurses -o cgdisk
		25	+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
		26
		27	sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
		28	# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o -L/usr/local/lib $(LDFLAGS) -luuid -licuio -lpopt -o sgdisk
		29	- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o -L/usr/local/lib $(LDFLAGS) -luuid -lpopt -o sgdisk
		30	+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
		31
		32	fixparts: $(MBR_LIB_OBJS) fixparts.o
		33	- $(CXX) $(MBR_LIB_OBJS) fixparts.o -L/usr/local/lib $(LDFLAGS) -o fixparts
		34	+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
		35
		36	lint: #no pre-reqs
		37	lint $(SRCS)